Added ability to choose either master or develop branch for Jenkins testing.

This commit is contained in:
alexjacks92 2014-01-14 16:31:16 -05:00
parent 99e50efd62
commit 1a1d4daed1

View File

@ -20,7 +20,7 @@ def compile(errore, attachli, parsedin):
global to global to
global server global server
global subj global subj
global email_enabled global email_enabled
global redo global redo
global tryredo global tryredo
global failedbool global failedbool
@ -40,7 +40,7 @@ def compile(errore, attachli, parsedin):
gitPull("sleuthkit") gitPull("sleuthkit")
if(passed): if(passed):
vsBuild() vsBuild()
print("TSK") print("TSK")
if(passed): if(passed):
gitPull("autopsy") gitPull("autopsy")
if(passed): if(passed):
@ -60,7 +60,7 @@ def compile(errore, attachli, parsedin):
if(tryredo): if(tryredo):
errorem = "" errorem = ""
errorem += "Rebuilt properly.\n" errorem += "Rebuilt properly.\n"
if email_enabled: if email_enabled:
Emailer.send_email(to, server, subj, errorem, attachl) Emailer.send_email(to, server, subj, errorem, attachl)
attachl = [] attachl = []
passed = True passed = True
@ -114,7 +114,7 @@ def vsBuild():
if(not tryredo): if(not tryredo):
errorem += "LIBTSK C++ failed to build.\n" errorem += "LIBTSK C++ failed to build.\n"
attachl.append(VSpth) attachl.append(VSpth)
if email_enabled: if email_enabled:
Emailer.send_email(parsed, errorem, attachl, False) Emailer.send_email(parsed, errorem, attachl, False)
tryredo = True tryredo = True
passed = False passed = False
@ -157,7 +157,7 @@ def antBuild(which, Build):
if(not tryredo): if(not tryredo):
errorem += "DataModel Java build failed.\n" errorem += "DataModel Java build failed.\n"
attachl.append(antpth) attachl.append(antpth)
if email_enabled: if email_enabled:
Emailer.send_email(to, server, subj, errorem, attachl) Emailer.send_email(to, server, subj, errorem, attachl)
passed = False passed = False
tryredo = True tryredo = True
@ -174,7 +174,7 @@ def main():
global email_enabled global email_enabled
global to global to
global server global server
global subj global subj
errore = "" errore = ""
attachli = [] attachli = []
config_file = "" config_file = ""
@ -188,8 +188,8 @@ def main():
subj = parsedin.getElementsByTagName("subject")[0].getAttribute("value").encode().decode("utf_8") subj = parsedin.getElementsByTagName("subject")[0].getAttribute("value").encode().decode("utf_8")
except Exception: except Exception:
email_enabled = False email_enabled = False
# email_enabled = (to is not None) and (server is not None) and (subj is not None) # email_enabled = (to is not None) and (server is not None) and (subj is not None)
email_enabled = False email_enabled = False
compile(errore, attachli, parsedin) compile(errore, attachli, parsedin)
class OS: class OS: