Merge pull request #424 from alexjacks92/master

Jenkins: adding develop branch testing

test/script/srcupdater.py

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