Merge pull request #424 from alexjacks92/master

Jenkins: adding develop branch testing
This commit is contained in:
Richard Cordovano 2014-01-14 13:48:26 -08:00
commit bfb10f3692

View File

@ -16,7 +16,7 @@ from xml.dom.minidom import parse, parseString
import Emailer import Emailer
from regression_utils import * from regression_utils import *
def compile(errore, attachli, parsedin): def compile(errore, attachli, parsedin, branch):
global to global to
global server global server
global subj global subj
@ -37,12 +37,12 @@ def compile(errore, attachli, parsedin):
while(redo): while(redo):
passed = True passed = True
if(passed): if(passed):
gitPull("sleuthkit") gitPull("sleuthkit", branch)
if(passed): if(passed):
vsBuild() vsBuild()
print("TSK") print("TSK")
if(passed): if(passed):
gitPull("autopsy") gitPull("autopsy", branch)
if(passed): if(passed):
antBuild("datamodel", False) antBuild("datamodel", False)
print("DataModel") print("DataModel")
@ -66,7 +66,7 @@ def compile(errore, attachli, parsedin):
passed = True passed = True
#Pulls from git #Pulls from git
def gitPull(TskOrAutopsy): def gitPull(TskOrAutopsy, branch):
global SYS global SYS
global errorem global errorem
global attachl global attachl
@ -75,7 +75,7 @@ def gitPull(TskOrAutopsy):
attachl.append(gppth) attachl.append(gppth)
gpout = open(gppth, 'a') gpout = open(gppth, 'a')
toPull = "https://www.github.com/sleuthkit/" + TskOrAutopsy toPull = "https://www.github.com/sleuthkit/" + TskOrAutopsy
call = ["git", "pull", toPull] call = ["git", "pull", toPull, branch]
if TskOrAutopsy == "sleuthkit": if TskOrAutopsy == "sleuthkit":
ccwd = os.path.join("..", "..", "..", "sleuthkit") ccwd = os.path.join("..", "..", "..", "sleuthkit")
else: else:
@ -181,6 +181,8 @@ def main():
arg = sys.argv.pop(0) arg = sys.argv.pop(0)
arg = sys.argv.pop(0) arg = sys.argv.pop(0)
config_file = arg config_file = arg
arg = sys.argv.pop(0)
branch = arg
parsedin = parse(config_file) parsedin = parse(config_file)
try: try:
to = parsedin.getElementsByTagName("email")[0].getAttribute("value").encode().decode("utf_8") to = parsedin.getElementsByTagName("email")[0].getAttribute("value").encode().decode("utf_8")
@ -190,7 +192,7 @@ def main():
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, branch)
class OS: class OS:
LINUX, MAC, WIN, CYGWIN = range(4) LINUX, MAC, WIN, CYGWIN = range(4)