Autobuilder patches

index 3b2591e..1b41927 100644
@@ -37,9 +37,9 @@ class PrepPkgIndex(ShellCommand):
         RPM_PUBLISH_DIR = os.environ.get("RPM_PUBLISH_DIR")
         IPK_PUBLISH_DIR = os.environ.get("IPK_PUBLISH_DIR")
         # Work around for #4186
-	command = "rm -rf ipk; cp -R " + DEST + "/" + IPK_PUBLISH_DIR + " ipk;"
-#        command = "rm -rf ipk; ln -s " + DEST + "/" + IPK_PUBLISH_DIR + " ipk;"
-#        command = command + "rm -rf rpm; ln -s " + DEST + "/" + RPM_PUBLISH_DIR + " rpm"
+	#command = "rm -rf ipk; cp -R " + DEST + "/" + IPK_PUBLISH_DIR + " ipk;"
+        command = "rm -rf ipk; ln -s " + DEST + "/" + IPK_PUBLISH_DIR + " ipk;"
+        #command = command + "rm -rf rpm; ln -s " + DEST + "/" + RPM_PUBLISH_DIR + " rpm"
         self.command = command
         ShellCommand.start(self)
 

index 2ffb3b2..d56143b 100644
@@ -58,7 +58,7 @@ class CheckOutLayers(YoctoGit):
         self.timeout = 100000
         self.getDescription = getDescription
         self.layername = layername
-        self.name="Git checkout of " + layername + " " + self.repourl + " " + self.workdir
+        self.name="Git checkout of " + layername
         kwargs['timeout']=self.timeout
         for k, v in argdict.iteritems():
             setattr(self, k, v)

@@ -69,25 +69,16 @@ class CheckOutLayers(YoctoGit):
                  getDescription=self.getDescription, layername=self.layername, **kwargs)
 
     def startVC(self, branch, revision, patch):
-        if self.getProperty('branch_trigger_'+self.layername+"_"+self.scheduler):
-            self.branch = self.getProperty('branch_trigger_'+self.layername+"_"+self.scheduler)
-        elif self.getProperty('branch_triggerer_'+self.layername+"_"+self.scheduler) :
-            self.branch = self.getProperty('branch_triggerer_'+self.layername+"_"+self.scheduler)
-        elif self.getProperty('branch_'+self.layername):
+        if self.getProperty('branch_'+self.layername):
             self.branch = self.getProperty('branch_'+self.layername)
         else:
             self.branch = "master"
-        if self.getProperty('repo_trigger_'+self.layername+"_"+self.scheduler):
-            self.repourl = self.getProperty('repo_trigger_'+self.layername+"_"+self.scheduler)
-        elif self.getProperty('repo_triggerer_'+self.layername+"_"+self.scheduler) :
-            self.repourl = self.getProperty('repo_triggerer_'+self.layername+"_"+self.scheduler)
-        elif self.getProperty('repo_'+self.layername):
+        if self.getProperty('repo_'+self.layername):
             self.repourl = self.getProperty('repo_'+self.layername)
-        else:self.repourl = "git://git.yoctoproject.org/poky"
+        else:
+            self.repourl = "git://git.yoctoproject.org/poky"
 
-        if self.getProperty('commit_trigger_'+self.layername+"_"+self.scheduler) == "HEAD" and \
-           self.getProperty('repo_trigger_'+self.layername+"_"+self.scheduler) == self.getProperty('triggers_repo_'+self.layername) and \
-           self.getProperty('branch_trigger_'+self.layername+"_"+self.scheduler) == self.getProperty('triggers_branch_'+self.layername) and \
+        if self.getProperty('commit_'+self.layername) == "HEAD" and \
            self.getProperty('commit_resolvedhead_'+self.layername) is not None:
             log.msg("Using Resolved HEAD")
             self.commit = self.getProperty('commit_resolvedhead_'+self.layername)

index c1c6605..88b12bf 100644
@@ -31,34 +31,18 @@ class ResolveLayerHead(ShellCommand):
         ShellCommand.__init__(self, **kwargs)
 
     def start(self):
-        if self.getProperty('branch_trigger_'+self.layername+"_"+self.scheduler):
-            self.branch = self.getProperty('branch_trigger_'+self.layername+"_"+self.scheduler)
-        elif self.getProperty('branch_triggerer_'+self.layername+"_"+self.scheduler) :
-            self.branch = self.getProperty('branch_triggerer_'+self.layername+"_"+self.scheduler)
-        elif self.getProperty('branch_'+self.layername):
+        if self.getProperty('branch_'+self.layername):
             self.branch = self.getProperty('branch_'+self.layername)
         else:
             self.branch = "master"
 
-        if self.getProperty('repo_trigger_'+self.layername+"_"+self.scheduler):
-            self.repourl = self.getProperty('repo_trigger_'+self.layername+"_"+self.scheduler)
-        elif self.getProperty('repo_triggerer_'+self.layername+"_"+self.scheduler) :
-            self.repourl = self.getProperty('repo_triggerer_'+self.layername+"_"+self.scheduler)
-        elif self.getProperty('repo_'+self.layername):
+        if self.getProperty('repo_'+self.layername):
             self.repourl = self.getProperty('repo_'+self.layername)
-        else:self.repourl = "git://git.yoctoproject.org/poky"
+        else:
+            self.repourl = "git://git.yoctoproject.org/poky"
 
-        if self.getProperty('commit_trigger_'+self.layername+"_"+self.scheduler) == "HEAD" and \
-           self.getProperty('repo_trigger_'+self.layername+"_"+self.scheduler) == self.getProperty('repo_'+self.layername) and \
-           self.getProperty('branch_trigger_'+self.layername+"_"+self.scheduler) == self.getProperty('branch_'+self.layername) and \
-           self.getProperty('commit_resolvedhead_'+self.layername) is not None:
+        if self.getProperty('commit_resolvedhead_'+self.layername) is not None:
             self.commit = self.getProperty('commit_resolvedhead_'+self.layername)
-        elif self.getProperty('commit_trigger_'+self.layername+"_"+self.scheduler):
-            self.commit = self.getProperty('commit_trigger_'+self.layername+"_"+self.scheduler)
-        elif self.getProperty('commit_triggerer_'+self.layername+"_"+self.scheduler) :
-            self.commit = self.getProperty('commit_triggerer_'+self.layername+"_"+self.scheduler)
-        elif self.getProperty('commit_'+self.layername):
-            self.commit = self.getProperty('commit_'+self.layername)
         else:
             self.commit = "HEAD"
         if self.commit == "HEAD":

index c913e93..7973a23 100644
@@ -59,11 +59,9 @@ class BuildSet():
                     for layer in layers:
                         kwargs=stepOrder[step]
                         layername=layer.iterkeys().next()
-                        log.msg(type(Property('commit_resolvedhead_'+layername)))
                         if os.environ.get("RESOLVE_TRIGGERED_HEAD") == "True":
                             m = __import__ ("ResolveLayerHead")
                             func = getattr(m, "ResolveLayerHead")
-                            log.msg(layer[layer.iterkeys().next()])
                             factoryFN(func(locals()['f'+name],
                                       layername=layername,
                                       scheduler=name,

index 93ce805..446631d 100644
@@ -470,8 +470,8 @@ class YoctoGit(Source):
         mirror = None
         if self.mirrordir:
             mirror = self.mirrordir + "/" + self.repourl.replace("git://", "") + "/"
-            if os.path.exists(mirror):
-                  command = ['clone'] + args + ["-s", "-n"] + [mirror, '.']
+            if self.pathExists(mirror):
+                  command = ['clone'] + ["-s", "-n"] + [mirror, '.']
 
         #Fix references
         if self.prog:

index 64dfe06..26599e7 100644
@@ -177,7 +177,7 @@ class YoctoGit(Source):
     @defer.inlineCallbacks
     def full(self):
         updatable = yield self._sourcedirIsUpdatable()
-
+        
         if self.method == 'clobber':
             yield self.clobber()
             return

@@ -201,7 +201,7 @@ class YoctoGit(Source):
     @defer.inlineCallbacks
     def incremental(self):
         updatable = yield self._sourcedirIsUpdatable()
-
+        
         # if not updateable, do a full checkout
         if not updatable:
             yield self._fullCloneOrFallback()

@@ -249,19 +249,24 @@ class YoctoGit(Source):
         if self.mirrordir:
             mirror = self.mirrordir + "/" + self.repourl.replace("git://", "") + "/"
             if self.pathExists(mirror):
-                self.srcdir=mirror
+                srcdir=mirror
             else:
-                self.srcdir='source/'+self.repourl
-        if self.layername == "poky" or self.layername == "oecore" or "eclipse" in self.layername:
-            self.todir = "build/"
+                srcdir='source/'+self.repourl
+        if "poky" in self.layername or \
+           "oecore" in self.layername or \
+           "eclipse" in self.layername:
+            todir = "."
+            self.workdir = "build"
         else:
-            self.todir = "build/" + self.layername
+            todir = "./" + self.layername
+            self.workdir = "build/" + self.layername
+
 
         d.addCallback(lambda _: self.incremental())
         def copy(_):
             cmd = buildstep.RemoteCommand('cpdir',
-                                          {'fromdir': self.srcdir,
-                                           'todir':self.todir,
+                                          {'fromdir': srcdir,
+                                           'todir': todir,
                                            'logEnviron': self.logEnviron,
                                            'timeout': self.timeout,})
             cmd.useLog(self.stdio_log, False)

@@ -273,8 +278,14 @@ class YoctoGit(Source):
             d.addCallback(lambda _: evaluateCommand(cmd))
             return d
         d.addCallback(copy)
+        
         def resetWorkdir(_):
-            self.workdir = 'build'
+            if "poky" in self.layername or \
+               "oecore" in self.layername or \
+               "eclipse" in self.layername:
+                self.workdir = 'build'
+            else:
+                self.workdir = "build/" + self.layername
             return 0
 
         d.addCallback(resetWorkdir)

@@ -289,13 +300,15 @@ class YoctoGit(Source):
         # Let's make the todir difficult to have duplicate dir names. This 
         # method probably won't work correctly crossing filesystems, so utilize 
         # movecopy with caution.
-        
+
+        srcdir='source/'+self.repourl
+
         cmd = buildstep.RemoteCommand('mv', {'fromdir': self.workdir,
-                                                                    'todir': self.storedir + '/' + self.getProperty("DEST") + '/' + 
-                                                                                str(int(time.time())) + '-'  + 
-                                                                                str(random.randrange(100, 100000, 2)) + 
-                                                                                self.layername,
-                                                                    'logEnviron':self.logEnviron,})
+                                             'todir': self.storedir + '/' + self.getProperty("DEST") + '/' + 
+                                                        str(int(time.time())) + '-'  + 
+                                                        str(random.randrange(100, 100000, 2)) + 
+                                                        self.layername,
+                                              'logEnviron':self.logEnviron,})
         cmd.useLog(self.stdio_log, False)
         d = self.runCommand(cmd)
         def evaluateCommand(cmd):

@@ -304,18 +317,29 @@ class YoctoGit(Source):
                 raise buildstep.BuildStepFailed()
         d.addCallback(lambda _: evaluateCommand(cmd))
 
-        todir = None
-        self.workdir = 'source/'+self.repourl
-        self.srcdir='source/'+self.repourl
-        d.addCallback(lambda _: self.incremental())
         if self.layername == "poky" or self.layername == "oecore":
-            self.todir = "build"
+            todir = "build"
         else:
-            self.todir = "build/" + self.layername
+            todir = "build/" + self.layername
+
+        def mkdir(_):
+            cmd = buildstep.RemoteCommand('mkdir', {'dir': 'build',
+                                                    'logEnviron': self.logEnviron,
+                                                    'timeout': self.timeout,})
+            cmd.useLog(self.stdio_log, False)
+            d = self.runCommand(cmd)
+            def evaluateCommand(cmd):
+                if cmd.didFail():
+                    log.msg("Source step failed while running command %s" % cmd)
+                    raise buildstep.BuildStepFailed()
+            d.addCallback(lambda _: evaluateCommand(cmd))
+            return d
+        d.addCallback(mkdir)
+        d.addCallback(lambda _: self.incremental())
         def copy(_):
             cmd = buildstep.RemoteCommand('cpdir',
-                                          {'fromdir': self.srcdir,
-                                           'todir':self.todir,
+                                          {'fromdir': srcdir,
+                                           'todir': todir,
                                            'logEnviron': self.logEnviron,
                                            'timeout': self.timeout,})
             cmd.useLog(self.stdio_log, False)

@@ -327,8 +351,14 @@ class YoctoGit(Source):
             d.addCallback(lambda _: evaluateCommand(cmd))
             return d
         d.addCallback(copy)
+
         def resetWorkdir(_):
-            self.workdir = 'build'
+            if "poky" in self.layername or \
+               "oecore" in self.layername or \
+               "eclipse" in self.layername:
+                self.workdir = 'build.'
+            else:
+                self.workdir = "build/" + self.layername
             return 0
         d.addCallback(resetWorkdir)
         return d

index 38f1980..1967b42 100644
@@ -152,7 +152,7 @@ class PublishArtifacts(ShellCommand):
                     command=command+"mkdir -p " + DEST + "/" + QEMU_PUBLISH_DIR + "/qemu-tiny;"
                     if self.layerversion_core is not None and int(self.layerversion_core) > 2:
                         command=command+"cp -R --no-dereference --preserve=links " + \
-                                        os.path.join(self.basedir, "tmp/deploy/images/qemux86/*") + \
+                                        os.path.join(self.basedir, "tmp/deploy/images/qemux86/* ") + \
                                         " " + DEST + "/" + QEMU_PUBLISH_DIR + "/qemu-tiny;"
                     else:
                         command=command+"cp -R --no-dereference --preserve=links " + \

index 1967b42..b7dc680 100644
@@ -54,7 +54,7 @@ class PublishArtifacts(ShellCommand):
                     artifact = "genericx86"
                 elif self.layerversion_yoctobsp is not None and int(self.layerversion_yoctobsp) < 2 and artifact == "genericx86":
                     artifact = "atom-pc"
-                elif self.layerversion_yoctobsp is not None and int(self.layerversion_yoctobsp) < 2 and artifact == "genericx86_64":
+                elif self.layerversion_yoctobsp is not None and int(self.layerversion_yoctobsp) < 2 and artifact == "genericx86-64":
                     artifact = "None"
                 if artifact == "adt-installer":
                     command=command+"mkdir -p " + os.path.join(DEST, ADT_INST_PUBLISH_DIR) + ";"

index 4626e02..d73f278 100644
@@ -1,6 +1,7 @@
 [GitSettings]
 OPTIMIZED_GIT_CLONE = True
 OGIT_TRASH_DIR = /tmp/yocto-autobuilder/git/trash
+OGIT_MIRROR_DIR = /tmp/yocto-autobuilder/git/mirror
 OGIT_TRASH_CRON_TIME = "0 0 * * *"
 OGIT_TRASH_NICE_LEVEL = "19"
 

index 7d06d06..25c3b4d 100644
@@ -72,6 +72,7 @@ class BuildSet():
                                 pass
                         else:
                             storedir=None
+                            mirrordir=None
                             method = 'clobber'
                             mode='full'
                             srcdir = 'source'                       

@@ -79,10 +80,12 @@ class BuildSet():
                                 if passed==0:
                                     method='movecopy'
                                     storedir=os.environ.get('OGIT_TRASH_DIR')
+                                    mirrordir=os.environ.get('OGIT_MIRROR_DIR')
                                     passed=1                              
                                 else:
                                     method='barecopy'
                                     storedir=os.environ.get('OGIT_TRASH_DIR')
+                                    mirrordir=os.environ.get('OGIT_MIRROR_DIR')
                                     passed=1                              
                             if layername == "poky" or layername == 'oecore':
                                 workdir = 'build'

@@ -99,6 +102,7 @@ class BuildSet():
                                       scheduler=name,
                                       method=method,
                                       storedir=storedir,
+                                      mirrordir=mirrordir,
                                       workdir=workdir,
                                       argdict=layer[layer.iterkeys().next()]))
                             if 'layerversion' in layer[layer.iterkeys().next()]:

index 191dc3f..2ffb3b2 100644
@@ -34,7 +34,7 @@ from buildbot.status import build
 from buildbot.process import buildstep
 
 class CheckOutLayers(YoctoGit):
-    def __init__(self, factory, scheduler=None, layername=None, mode='full',  storedir=None,
+    def __init__(self, factory, scheduler=None, layername=None, mode='full',  storedir=None, mirrordir=None,
                 method='clobber', submodules=False, shallow=False, srcdir='source', workdir='build',
                 timeout=100000, progress=True, retryFetch=True, clobberOnFailure=False, 
                 getDescription=True, argdict=None,

@@ -51,6 +51,7 @@ class CheckOutLayers(YoctoGit):
         self.submodules = submodules
         self.shallow = shallow
         self.storedir=storedir
+        self.mirrordir=mirrordir
         self.fetchcount = 0
         self.clobberOnFailure = clobberOnFailure
         self.mode = mode

@@ -62,7 +63,7 @@ class CheckOutLayers(YoctoGit):
         for k, v in argdict.iteritems():
             setattr(self, k, v)
         YoctoGit.__init__(self, repourl=self.repourl, branch=self.branch, mode=self.mode,
-                 method=self.method, storedir=self.storedir, submodules=self.submodules, srcdir=self.srcdir+"/"+self.repourl,
+                 method=self.method, storedir=self.storedir, mirrordir=mirrordir, submodules=self.submodules, srcdir=self.srcdir+"/"+self.repourl,
                  workdir=self.workdir, shallow=self.shallow, progress=self.progress, 
                  retryFetch=self.retryFetch, clobberOnFailure=self.clobberOnFailure, 
                  getDescription=self.getDescription, layername=self.layername, **kwargs)

index 7c95d2d..93ce805 100644
@@ -63,7 +63,7 @@ class YoctoGit(Source):
     def __init__(self, repourl=None, branch='HEAD', mode='incremental',
                  method=None, submodules=False, shallow=False, progress=False,
                  retryFetch=False, clobberOnFailure=False, getDescription=False, 
-				 workdir='build', layername=None, srcdir='sources', storedir="/tmp/junk",
+                 workdir='build', layername=None, srcdir='sources', storedir="/tmp/junk", mirrordir=None,
                  config=None, **kwargs):
         """
         @type  repourl: string

@@ -128,6 +128,7 @@ class YoctoGit(Source):
         self.srcdir  = srcdir
         self.workdir = workdir
         self.storedir = storedir
+        self.mirrordir = mirrordir
         self.layername = layername
         self.fetchcount = 0
         self.clobberOnFailure = clobberOnFailure

@@ -175,17 +176,18 @@ class YoctoGit(Source):
 
     @defer.inlineCallbacks
     def full(self):
+        updatable = yield self._sourcedirIsUpdatable()
+
         if self.method == 'clobber':
             yield self.clobber()
             return
         elif self.method == 'barecopy':
             yield self.barecopy()
             return
-        elif self.method == 'movecopy':
+        elif updatable and self.method == 'movecopy':
             yield self.movecopy()
             return
 
-        updatable = yield self._sourcedirIsUpdatable()
         if not updatable:
             log.msg("No git repo present, making full clone")
             yield self._fullCloneOrFallback()

@@ -463,12 +465,24 @@ class YoctoGit(Source):
             args += ['--depth', '1']
         command = ['clone'] + args + [self.repourl, '.']
 
+        import os
+
+        mirror = None
+        if self.mirrordir:
+            mirror = self.mirrordir + "/" + self.repourl.replace("git://", "") + "/"
+            if os.path.exists(mirror):
+                  command = ['clone'] + args + ["-s", "-n"] + [mirror, '.']
+
         #Fix references
         if self.prog:
             command.append('--progress')
 
         # If it's a shallow clone abort build step
         d = self._dovccmd(command, shallowClone)
+
+        if mirror:
+            d.addCallback(lambda _: self._fetch(None))
+
         # If revision specified checkout that revision
         if self.revision:
             d.addCallback(lambda _: self._dovccmd(['reset', '--hard',

index e2aec21..c6c4bc0 100644
@@ -19,6 +19,8 @@ from buildbot.schedulers.basic  import SingleBranchScheduler
 from buildbot.changes import filter
 from buildbot.changes.pb import PBChangeSource
 from lib.ABTools import capitalize
+import ast
+import BuildSet
 
 class Autobuilder:
     def __init__(self, cfile=None):

@@ -35,6 +37,154 @@ class Autobuilder:
             except:
                 self.cfile = "./buildset-config/yoctoAB.conf"
 
+    def createBuildsets(self):
+        beenHere=[]
+        sort = True
+        if self.config.has_option('BuildSets', 'order'):
+            sort = False
+            for set in ast.literal_eval(self.config.get('BuildSets', 'order')):
+                beenHere.append(set)
+        for key in self.configdict:
+            if key not in beenHere and key != "BuildSets":
+                beenHere.append(key)
+        if sort:
+            beenHere.sort()
+        # REALLY crappy way to do this, but better than setting globals. 
+        os.environ["YOCTO_SORTED_BUILDERS"]= str(beenHere)
+        for buildset in beenHere:
+            self.schedprops = []
+            self.checkoutprops={}
+            self.set_props = {}
+            self.repos = []
+            self.properties = []
+            self.builders = None
+            self.schedprops.append(NestedParameter(name='ss_' + buildset, label="<h3><div class='trigger_heading' id='"+buildset+"'>" + buildset + " defaults:</div></h3>", fields=[FixedParameter(name="dummy", default="dummy")]))
+            self.parseBuildSet(buildset)
+            locals()['buildset_%s' % buildset]=BuildSet.BuildSet(name=buildset,
+                                                            steps=ast.literal_eval(self.configdict[buildset]['steps']), 
+                                                            builders=self.builders,
+                                                            layers=ast.literal_eval(self.configdict[buildset]['repos']),
+                                                            set_props=self.set_props)
+            self.yocto_sched.append(ForceScheduler(
+                                name=str(buildset),
+                                branch=FixedParameter(name="branch", 
+                                                      default=""),
+                                reason=StringParameter(name="reason",
+                                                       label="Reason:<br>",
+                                                       required=False, 
+                                                       size=120),
+                                revision=FixedParameter(name="revision", 
+                                                        default=""),
+                                repository=FixedParameter(name="repository",
+                                                          default=""),
+                                project=FixedParameter(name="repository",
+                                                       default=""),
+                                builderNames=['%s' % buildset],
+                                properties=self.schedprops))
+            self.createExtraSchedulers(key=buildset, checkoutprops=self.checkoutprops)
+
+    def parseBuildSet(self, buildset):
+        if buildset is not "BuildSets":
+            self.builders=self.parseBuilders(buildset)
+            self.parseProps(buildset)
+            self.parseRepos(buildset)
+            self.parseSteps(buildset)
+            self.set_props.update(self.checkoutprops)
+
+    def parseSteps(self, buildset):
+        buildset=buildset
+        for step in ast.literal_eval(self.configdict[buildset]['steps']):
+            if step.has_key('TriggerBuilds'):
+                master_trigger_name = step['TriggerBuilds']['schedulerName']
+                for b in ["", "_nowait"]:
+                    buildername=[]
+                    if 'schedulerNames' + b in step['TriggerBuilds' ]:
+                        for scheduler in step['TriggerBuilds']['schedulerNames' + b].iterkeys():
+                            if scheduler not in buildername:
+                                self.parseBuildSet(scheduler)
+                                buildername.append(scheduler)
+                        self.yocto_sched.append(Triggerable(name="trigger_" + master_trigger_name + b, builderNames=buildername))
+
+    def parseRepos(self, buildset=None):
+        buildset=buildset
+        if DEBUG is True:
+            log.msg(buildset + " uses these repos:")
+        for layer in ast.literal_eval(self.configdict[buildset]['repos']):
+            if layer.iterkeys().next() not in self.repos:
+                schedpropstoextend, newcheckoutprops = self.CreateLayerSchedulerParams(layer=layer, trigger=buildset, triggerer=True)
+                self.schedprops.extend(schedpropstoextend)
+                self.checkoutprops.update(newcheckoutprops)
+                self.repos.append(layer.iterkeys().next())
+        return
+
+    def parseProps(self, buildset):
+        buildset=buildset
+        if self.configdict[buildset].has_key('props'):
+            for props in ast.literal_eval(self.configdict[buildset]['props']):
+                for prop in dict(props):
+                    self.prop_name=""
+                    self.prop_prop_type=""
+                    self.prop_default="" 
+                    self.prop_choices="" 
+                    self.prop_label=""
+                    self.prop_required=""
+                    self.prop_size=""
+                    setattr(self, "prop_name", prop)
+                    for k, v in props[prop].iteritems():
+                        setattr(self, "prop_"+str(k), v)
+                    if self.prop_name not in self.properties:
+                        schedpropstoextend = self.CreateExtraSchedulerParams(name=self.prop_name, 
+                                                                           prop_type=self.prop_prop_type,
+                                                                           default=self.prop_default, 
+                                                                           choices=self.prop_choices, 
+                                                                           label=self.prop_label, 
+                                                                           required=self.prop_required, 
+                                                                           scheduler=buildset,
+                                                                           size=self.prop_size)
+                        self.schedprops.extend(schedpropstoextend)
+                        self.properties.append(self.prop_name)
+
+    def parseBuilders(self, buildset):
+        buildset=buildset
+        builders=ast.literal_eval(self.configdict[buildset]['builders'])
+        if DEBUG is True:
+            log.msg(buildset + " is built on " + str(builders))
+        return builders 
+
+    def parseConfig(self):
+        import ConfigParser
+        from os import listdir
+        from os.path import dirname, isfile, join
+        print "LOADING CONFIG FILE"
+        self.config = ConfigParser.ConfigParser()
+        self.configdir=os.path.dirname(self.cfile)
+        self.configfiles = [ join(self.configdir,f) for f in listdir(self.configdir) if isfile(join(self.configdir,f)) and (f != 'autobuilder.conf') ]
+        try:
+            self.config.read(self.configfiles)
+        except:
+            print "Can't seem to find the Config file. Is YOCTO_AB_CONFIG set?"
+        self.buildsets=self.config.sections()
+        self.configdict = {}
+        for section in self.buildsets:
+            self.configdict[section]= dict(self.config.items(section))
+        return self.configdict
+
+    def GetLayerCommitId(self, layer):
+            if 'hash' in layer[layer.iterkeys().next()] :
+                layercommitid=layer[layer.iterkeys().next()]['hash']
+            elif 'tag' in layer[layer.iterkeys().next()]:
+                layercommitid=layer[layer.iterkeys().next()]['tag']
+            else:
+                layercommitid="HEAD"
+            return layercommitid
+
+    def GetLayerBranch(self, layer):
+            if 'branch' in layer[layer.iterkeys().next()]:
+                layerbranch=layer[layer.iterkeys().next()]['branch']
+            else:
+                layerbranch="master"
+            return layerbranch
+
     # Create extra schedulers requested for the given buildset using 'scheduler:'
     def createExtraSchedulers(self, key, checkoutprops):
         import ast

@@ -109,156 +259,6 @@ class Autobuilder:
                                                               dayOfWeek=builddayOfWeek))
 
 
-    def createBuildsets(self):
-        import BuildSet
-        import ast
-        beenHere=[]
-        sort = True
-        if self.config.has_option('BuildSets', 'order'):
-            sort = False
-            for set in ast.literal_eval(self.config.get('BuildSets', 'order')):
-                beenHere.append(set)
-        for key in self.configdict:
-            if key not in beenHere and key != "BuildSets":
-                beenHere.append(key)
-        if sort:
-            beenHere.sort()
-        # REALLY crappy way to do this, but better than setting globals. 
-        os.environ["YOCTO_SORTED_BUILDERS"]= str(beenHere)
-        for key in beenHere:
-            log.msg(key)
-            builders=ast.literal_eval(self.configdict[key]['builders']), 
-            if key is not "BuildSets":
-                schedprops = []
-                checkoutprops={}
-                set_props = {}
-                schedprops.append(NestedParameter(name='ss_' + key, label="<h3><div class='trigger_heading' id='"+key+"'>" + key + " defaults:</div></h3>", fields=[FixedParameter(name="dummy", default="dummy")]))
-                if self.configdict[key].has_key('props'):
-                    for props in ast.literal_eval(self.configdict[key]['props']):
-                        for prop in dict(props):
-                            self.prop_name=""
-                            self.prop_prop_type=""
-                            self.prop_default="" 
-                            self.prop_choices="" 
-                            self.prop_label=""
-                            self.prop_required=""
-                            self.prop_size=""
-                            setattr(self, "prop_name", prop)
-                            for k, v in props[prop].iteritems():
-                                setattr(self, "prop_"+str(k), v)
-                            schedpropstoextend = self.CreateExtraSchedulerParams(name=self.prop_name, 
-                                                                                 prop_type=self.prop_prop_type,
-                                                                                 default=self.prop_default, 
-                                                                                 choices=self.prop_choices, 
-                                                                                 label=self.prop_label, 
-                                                                                 required=self.prop_required, 
-                                                                                 scheduler=key,
-                                                                                 size=self.prop_size)
-                            schedprops.extend(schedpropstoextend)
-                for layer in ast.literal_eval(self.configdict[key]['repos']):
-                    schedpropstoextend, newcheckoutprops = self.CreateLayerSchedulerParams(layer=layer, trigger=key, triggerer=True)
-                    schedprops.extend(schedpropstoextend)
-                    checkoutprops.update(newcheckoutprops)
-                    
-                for step in ast.literal_eval(self.configdict[key]['steps']):
-                    if step.has_key('TriggerBuilds'):
-                        layername=layer.iterkeys().next()
-                        master_trigger_name = step['TriggerBuilds']['schedulerName']                        
-                        schedprops.append(NestedParameter(name='blank_triggered_builds', 
-                                                          label="<h3> Layers within triggered builds. These will not inherit the main repo/branch.<hr></h3>",
-                                                          fields=[FixedParameter(name="dummy", default="dummy")]))                        
-                        buildername=[]
-                        for scheduler in step['TriggerBuilds']['schedulerNames'].iterkeys():
-                            schedprops.append(NestedParameter(name='ss_' + scheduler, label="<h3><div class='trigger_heading' id='"+scheduler+"'>" + key + " " + scheduler + " defaults:</div></h3>", fields=[FixedParameter(name="dummy", default="dummy")]))
-                            
-                            for triggered_layer in ast.literal_eval(self.configdict[scheduler]['repos']):
-                                schedpropstoextend, newcheckoutprops = self.CreateLayerSchedulerParams(layer=triggered_layer, trigger=scheduler, triggerer=False)
-                                schedprops.extend(schedpropstoextend)
-                                checkoutprops.update(newcheckoutprops)
-                            if self.configdict[scheduler].has_key('props'):
-                                for sched_props in ast.literal_eval(self.configdict[scheduler]['props']):
-                                    for prop in dict(sched_props):
-                                        self.prop_name=""
-                                        self.prop_prop_type=""
-                                        self.prop_default="" 
-                                        self.prop_choices="" 
-                                        self.prop_label=""
-                                        self.prop_required=""
-                                        self.prop_size=""
-                                        setattr(self, "prop_name", prop)
-                                        for k, v in sched_props[prop].iteritems():
-                                            setattr(self, "prop_"+str(k), v)
-                                        schedpropstoextend = self.CreateExtraSchedulerParams(name=self.prop_name, 
-                                                                                             prop_type=self.prop_prop_type,
-                                                                                             default=self.prop_default, 
-                                                                                             choices=self.prop_choices, 
-                                                                                             label=self.prop_label, 
-                                                                                             required=self.prop_required, 
-                                                                                             size=self.prop_size,
-                                                                                             scheduler=scheduler)
-                                        schedprops.extend(schedpropstoextend)
-                            buildername.append(scheduler)
-                        self.yocto_sched.append(Triggerable(name="trigger_" + master_trigger_name, builderNames=buildername))
-                set_props.update(checkoutprops)
-
-                locals()['buildset_%s' % key]=BuildSet.BuildSet(name=key,
-                                                                steps=ast.literal_eval(self.configdict[key]['steps']), 
-                                                                builders=ast.literal_eval(self.configdict[key]['builders']),
-                                                                layers=ast.literal_eval(self.configdict[key]['repos']),
-                                                                set_props=set_props)
-
-                self.yocto_sched.append(ForceScheduler(
-                                    name=str(key),
-                                    branch=FixedParameter(name="branch", 
-                                                          default=""),
-                                    reason=StringParameter(name="reason",
-                                                           label="Reason:<br>",
-                                                           required=False, 
-                                                           size=120),
-                                    revision=FixedParameter(name="revision", 
-                                                            default=""),
-                                    repository=FixedParameter(name="repository",
-                                                              default=""),
-                                    project=FixedParameter(name="repository",
-                                                           default=""),
-                                    builderNames=['%s' % key],
-                                    properties=schedprops))
-                self.createExtraSchedulers(key=key, checkoutprops=checkoutprops)
-
-    def parseConfig(self):
-        import ConfigParser
-        from os import listdir
-        from os.path import dirname, isfile, join
-        print "LOADING CONFIG FILE"
-        self.config = ConfigParser.ConfigParser()
-        self.configdir=os.path.dirname(self.cfile)
-        self.configfiles = [ join(self.configdir,f) for f in listdir(self.configdir) if isfile(join(self.configdir,f)) and (f != 'autobuilder.conf') ]
-        try:
-            self.config.read(self.configfiles)
-        except:
-            print "Can't seem to find the Config file. Is YOCTO_AB_CONFIG set?"
-        self.buildsets=self.config.sections()
-        self.configdict = {}
-        for section in self.buildsets:
-            self.configdict[section]= dict(self.config.items(section))
-        return self.configdict
-
-    def GetLayerCommitId(self, layer):
-            if 'hash' in layer[layer.iterkeys().next()] :
-                layercommitid=layer[layer.iterkeys().next()]['hash']
-            elif 'tag' in layer[layer.iterkeys().next()]:
-                layercommitid=layer[layer.iterkeys().next()]['tag']
-            else:
-                layercommitid="HEAD"
-            return layercommitid
-
-    def GetLayerBranch(self, layer):
-            if 'branch' in layer[layer.iterkeys().next()]:
-                layerbranch=layer[layer.iterkeys().next()]['branch']
-            else:
-                layerbranch="master"
-            return layerbranch
-
     def CreateExtraSchedulerParams(self, name=None, 
                                          prop_type=None, 
                                          default=None, 

@@ -267,98 +267,90 @@ class Autobuilder:
                                          required=None, 
                                          size=None,
                                          scheduler=""):
-        self.supported_prop_types  = ["ChoiceStringParameter", 
+        supported_prop_types  = ["ChoiceStringParameter", 
                          "StringParameter",
                          "FixedParameter",
                          "BooleanParameter"]
-        self.schedprops = []
-        self.prop_type=prop_type
-        self.name=name
-        self.choices=choices
-        self.prop_type=prop_type
-        self.label=label
-        self.required=required
-        self.size=size
-        self.default=default
-        self.scheduler=scheduler
-        self.id="custom_"+self.name+"_"+self.scheduler
-        if self.label is None:
-            self.label=self.name
+        schedprops = []
+        prop_type=prop_type
+        name=name
+        choices=choices
+        prop_type=prop_type
+        label=label
+        required=required
+        size=size
+        default=default
+        scheduler=scheduler
+        propid="custom_"+name
+        if label is None:
+            label=self.name
 
-        if self.default is None:
+        if default is None:
             if prop_type == "FixedParameter":
                 try:
                     raise ABConfigError("your config file has a fixed type property declaration that has no default")
                 except ABConfigError, (instance):
                     log.msg("Caught: " + instance.parameter)
             else:
-                self.default = ""
+                default = ""
 
-        if self.prop_type == "ChoiceStringParameter":
-            if self.choices is None: 
+        if prop_type == "ChoiceStringParameter":
+            if choices is None: 
                 try:
                     raise ABConfigError("your config file has a ChoiceStringParameter declaration that has no choices")
                 except ABConfigError, (instance):
                     log.msg("Caught: " + instance.parameter)
 
-        if self.required is None:
-            self.required=True
+        if required is None:
+            required=True
 
-        if self.size is None:
-            self.size=80
+        if size is None:
+            size=80
 
-        if self.prop_type is None:
-            self.prop_type = "StringParameter"
+        if prop_type is None:
+            prop_type = "StringParameter"
 
-        if self.prop_type=="ChoiceStringParameter":
-           self.schedprops.append(ChoiceStringParameter(name=self.id, 
-                                             label=self.label, 
-                                             required=self.required, 
-                                             choices=self.choices))
-        elif self.prop_type=="StringParameter":
-           self.schedprops.append(StringParameter(name=self.id, 
-                                             label=self.label, 
-                                             required=self.required, 
-                                             default=self.default,
-                                             size=self.size))
-        elif self.prop_type=="FixedParameter":
-           self.schedprops.append(FixedParameter(name=self.id, 
-                                             label=self.label, 
-                                             required=self.required, 
-                                             default=self.default))
-        elif self.prop_type=="BooleanParameter":
-           self.schedprops.append(BooleanParameter(name=self.id, 
-                                             label=self.label, 
-                                             required=self.required, 
-                                             default=self.default))
+        if prop_type=="ChoiceStringParameter":
+           schedprops.append(ChoiceStringParameter(name=propid, 
+                                             label=label, 
+                                             required=required, 
+                                             choices=choices))
+        elif prop_type=="StringParameter":
+           schedprops.append(StringParameter(name=propid,
+                                             label=label, 
+                                             required=required, 
+                                             default=default,
+                                             size=size))
+        elif prop_type=="FixedParameter":
+           schedprops.append(FixedParameter(name=propid, 
+                                             label=label, 
+                                             required=required, 
+                                             default=default))
+        elif prop_type=="BooleanParameter":
+           schedprops.append(BooleanParameter(name=propid, 
+                                             label=label, 
+                                             required=required, 
+                                             default=default))
         else:
             try:
                 raise ABConfigError("your config file has a prop declaration that is not valid")
             except ABConfigError, (instance):
                 log.msg("Caught: " + instance.parameter)
-        return self.schedprops
+        return schedprops
 
     def CreateLayerSchedulerParams(self, layer=None, trigger=None, triggerer=None):
             schedprops = []
             set_checkoutprops = {}
             layerrepo=layer[layer.iterkeys().next()]['repourl']
-            log.msg(layerrepo)
             layerbranch=self.GetLayerBranch(layer)
             layercommitid=self.GetLayerCommitId(layer)
-            if triggerer is True:
-                layername="triggerer_" + layer.iterkeys().next() + "_" + trigger
-                layerlabel=capitalize(trigger) + " " + capitalize(layer.iterkeys().next())
-                
-                set_checkoutprops['repo_' + layername] = layerrepo
-                set_checkoutprops['branch_' + layername] =  layerbranch
-            else:
-                layername="trigger_" + layer.iterkeys().next() + "_" + trigger
-                layerlabel=capitalize(trigger) + " " + capitalize(layer.iterkeys().next())
-                set_checkoutprops['repo_' + layername] =  layerrepo
-                set_checkoutprops['branch_' + layername] =  layerbranch
-            schedprops.append(StringParameter(name="repo_"+ layername, label="Repository:<br>", required=True, default=layerrepo, size=80))
-            schedprops.append(StringParameter(name="branch_" + layername, label="Branch:<br>", required=True, default=layerbranch, size=80))
-            schedprops.append(StringParameter(name="commit_" + layername, label="Tag/Commit Hash:<br>", required=True, default=layercommitid, size=80))
+            layername=layer.iterkeys().next()
+            set_checkoutprops['repo_' + layername] = layerrepo
+            set_checkoutprops['branch_' + layername] =  layerbranch
+            set_checkoutprops['commit_' + layername] =  layercommitid
+            schedprops.append(StringParameter(name="repo_"+ layername, label="<hr><b>" + layername + "</b> Repository:<br>", required=True, default=layerrepo, size=50))
+            schedprops.append(StringParameter(name="branch_" + layername, label="Branch:<br>", required=True, default=layerbranch, size=18))
+            schedprops.append(StringParameter(name="commit_" + layername, label="Tag/Commit Hash:<br>", required=True, default=layercommitid, size=20))
             return schedprops, set_checkoutprops
 
 class ABConfigError(Exception):

68 lines not on this page · raw message

index c6c4bc0..5d7ff7c 100644
@@ -107,8 +107,6 @@ class Autobuilder:
 
     def parseRepos(self, buildset=None):
         buildset=buildset
-        if DEBUG is True:
-            log.msg(buildset + " uses these repos:")
         for layer in ast.literal_eval(self.configdict[buildset]['repos']):
             if layer.iterkeys().next() not in self.repos:
                 schedpropstoextend, newcheckoutprops = self.CreateLayerSchedulerParams(layer=layer, trigger=buildset, triggerer=True)

@@ -147,8 +145,6 @@ class Autobuilder:
     def parseBuilders(self, buildset):
         buildset=buildset
         builders=ast.literal_eval(self.configdict[buildset]['builders'])
-        if DEBUG is True:
-            log.msg(buildset + " is built on " + str(builders))
         return builders 
 
     def parseConfig(self):

index d006bab..32779ae 100644
@@ -173,7 +173,6 @@
         push the 'Force Build' button</p>
   {% endif %}
   <input type='hidden' name='forcescheduler' value='{{sch.name}}' />
-  <input type="button" value="Set all triggered builders to same repo/branch combo" onClick="setRepoBranch('{{sch.name}}');">
   <p>  
   <hr />
   {% for f in sch.all_fields %}

index 178c809..01dfb80 100644
@@ -1,6 +1,6 @@
 {%- block doctype -%}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 {% endblock %}
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>

@@ -17,182 +17,12 @@
     <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ path_to_root }}rss">
     <link rel="shortcut icon" href="{{ path_to_root }}favicon.ico">
     {% endblock %}
-    <script type="text/javascript">
-/*
- * jQuery JavaScript Library v1.3.2
- * http://jquery.com/
- *
- * Copyright (c) 2009 John Resig
- * Dual licensed under the MIT and GPL licenses.
- * http://docs.jquery.com/License
- *
- * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009)
- * Revision: 6246
- */
-(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.sele
 ctor=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this
 ;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G
 ){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="st
 ring"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F<J;F++){var G=M[F];if(G.selected){K=o(G).val();if(H){return K}L.push(K)}}return L}return(E.value||"").replace(/\r/g,"")}return g}if(typeof K==="number"){K+=""}return this.each(function(){if(this.nodeType!=1){return}if(o.isArray(K)&&/radio|checkbox/.test(this.type)){this.checked=(o
 .inArray(this.value,K)>=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G<E;G++){L.call(K(t
 his[G],H),this.length>1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H<I;H++){if((G=arguments[H])!=null){for(var F in G){var K=J[F],L=G[F];if(J===L){continue}if(E&&L&&typeof L==="object"&&!L.nodeType){J[F]=o.extend(E,K||(L.length!=null?[]:{}),L)}else{if(L!==g){J[F]=L}}}}}return J};var b=/z-?index|font-?weight|opacity|zoom|line-?height/i,q=document.defaultView||{},s=Obje
 ct.prototype.toString;o.extend({noConflict:function(E){l.$=p;if(E){l.jQuery=y}return o},isFunction:function(E){return s.call(E)==="[object Function]"},isArray:function(E){return s.call(E)==="[object Array]"},isXMLDoc:function(E){return E.nodeType===9&&E.documentElement.nodeName!=="HTML"||!!E.ownerDocument&&o.isXMLDoc(E.ownerDocument)},globalEval:function(G){if(G&&/\S/.test(G)){var F=document.getElementsByTagName("head")[0]||document.documentElement,E=document.createElement("script");E.type="text/javascript";if(o.support.scriptEval){E.appendChild(document.createTextNode(G))}else{E.text=G}F.insertBefore(E,F.firstChild);F.removeChild(E)}},nodeName:function(F,E){return F.nodeName&&F.nodeName.toUpperCase()==E.toUpperCase()},each:function(G,K,F){var E,H=0,I=G.length;if(F){if(I===g){for(E in G){if(K.apply(G[E],F)===false){break}}}else{for(;H<I;){if(K.apply(G[H++],F)===false){break}}}}else{if(I===g){for(E in G){if(K.call(G[E],E,G[E])===false){break}}}else{for(var J=G[0];H<I&&K.call(J,H,J)!=
 =false;J=G[++H]){}}}return G},prop:function(H,I,G,F,E){if(o.isFunction(I)){I=I.call(H,F)}return typeof I==="number"&&G=="curCSS"&&!b.test(E)?I+"px":I},className:{add:function(E,F){o.each((F||"").split(/\s+/),function(G,H){if(E.nodeType==1&&!o.className.has(E.className,H)){E.className+=(E.className?" ":"")+H}})},remove:function(E,F){if(E.nodeType==1){E.className=F!==g?o.grep(E.className.split(/\s+/),function(G){return !o.className.has(F,G)}).join(" "):""}},has:function(F,E){return F&&o.inArray(E,(F.className||F).toString().split(/\s+/))>-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(H,F,J,E){if(F=="width"||F=="height"){var L,G={position:"absolute",visibility:"hidden",display:"block"},K=F=="width"?["Left","Right"]:["Top","Bottom"];function I(){L=F=="width"?H.offsetWidth:H.offsetHeight;if(E==="border"){return}o.each(K,function(){if(!E){L-=parseFloat(o.curCSS(H,"padding"+this,true))||0}if(E==="m
 argin"){L+=parseFloat(o.curCSS(H,"margin"+this,true))||0}else{L-=parseFloat(o.curCSS(H,"border"+this+"Width",true))||0}})}if(H.offsetWidth!==0){I()}else{o.swap(H,G,I)}return Math.max(0,Math.round(L))}return o.curCSS(H,F,J)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDoc

index b7dc680..00f6852 100644
@@ -79,13 +79,13 @@ class PublishArtifacts(ShellCommand):
                     command=command+"mkdir -p " + DEST + "/eclipse-plugin/juno;"
                     command=command+"cp -R --no-dereference --preserve=links " + \
                                      os.path.join(os.path.join(self.slavedir, buildername), 
-                                                 "build/eclipse-poky-juno/scripts/org.*.zip") + \
+                                                 "build/scripts/org.*.zip") + \
                                      " " + DEST + "/eclipse-plugin/juno;"
                 elif artifact == "eclipse-plugin-kepler":
                     command=command+"mkdir -p " + DEST + "/eclipse-plugin/kepler;"
                     command=command+"cp -R --no-dereference --preserve=links " + \
                                      os.path.join(os.path.join(self.slavedir, buildername), 
-                                                 "build/eclipse-poky-kepler/scripts/org.*.zip") + \
+                                                 "build/scripts/org.*.zip") + \
                                      " " + DEST + "/eclipse-plugin/kepler;"
                 elif artifact == "build-appliance":
                     command=command+"mkdir -p " + DEST + "/" + BA_PUBLISH_DIR + ";"

index 227d5f6..69c1e83 100644
@@ -137,8 +137,8 @@ if [ -n "${config_check:+x}" ]; then
     echo ""
     echo " Ready to start the yocto autobuilder."
     echo ""
-    echo " The yocto-autobuilder runs buildbot 0.8.7p1 with some modifications to "
-    echo " layout.py and buildbot/status/master.py. "
+    echo " The yocto-autobuilder runs buildbot 0.8.8 with some modifications and"
+    echo " a different git fetcher (yoctogit.py)"
     echo ""
     echo "#########################################################################"
     buildbot upgrade-master ${PWD}/yocto-master

index 5d7ff7c..4c33489 100644
@@ -49,7 +49,7 @@ class Autobuilder:
                 beenHere.append(key)
         if sort:
             beenHere.sort()
-        # REALLY crappy way to do this, but better than setting globals. 
+        # REALLY crappy way to do this, but better than setting globals.
         os.environ["YOCTO_SORTED_BUILDERS"]= str(beenHere)
         for buildset in beenHere:
             self.schedprops = []

@@ -61,19 +61,19 @@ class Autobuilder:
             self.schedprops.append(NestedParameter(name='ss_' + buildset, label="<h3><div class='trigger_heading' id='"+buildset+"'>" + buildset + " defaults:</div></h3>", fields=[FixedParameter(name="dummy", default="dummy")]))
             self.parseBuildSet(buildset)
             locals()['buildset_%s' % buildset]=BuildSet.BuildSet(name=buildset,
-                                                            steps=ast.literal_eval(self.configdict[buildset]['steps']), 
+                                                            steps=ast.literal_eval(self.configdict[buildset]['steps']),
                                                             builders=self.builders,
                                                             layers=ast.literal_eval(self.configdict[buildset]['repos']),
                                                             set_props=self.set_props)
             self.yocto_sched.append(ForceScheduler(
                                 name=str(buildset),
-                                branch=FixedParameter(name="branch", 
+                                branch=FixedParameter(name="branch",
                                                       default=""),
                                 reason=StringParameter(name="reason",
                                                        label="Reason:<br>",
-                                                       required=False, 
+                                                       required=False,
                                                        size=120),
-                                revision=FixedParameter(name="revision", 
+                                revision=FixedParameter(name="revision",
                                                         default=""),
                                 repository=FixedParameter(name="repository",
                                                           default=""),

@@ -122,8 +122,8 @@ class Autobuilder:
                 for prop in dict(props):
                     self.prop_name=""
                     self.prop_prop_type=""
-                    self.prop_default="" 
-                    self.prop_choices="" 
+                    self.prop_default=""
+                    self.prop_choices=""
                     self.prop_label=""
                     self.prop_required=""
                     self.prop_size=""

@@ -131,12 +131,12 @@ class Autobuilder:
                     for k, v in props[prop].iteritems():
                         setattr(self, "prop_"+str(k), v)
                     if self.prop_name not in self.properties:
-                        schedpropstoextend = self.CreateExtraSchedulerParams(name=self.prop_name, 
+                        schedpropstoextend = self.CreateExtraSchedulerParams(name=self.prop_name,
                                                                            prop_type=self.prop_prop_type,
-                                                                           default=self.prop_default, 
-                                                                           choices=self.prop_choices, 
-                                                                           label=self.prop_label, 
-                                                                           required=self.prop_required, 
+                                                                           default=self.prop_default,
+                                                                           choices=self.prop_choices,
+                                                                           label=self.prop_label,
+                                                                           required=self.prop_required,
                                                                            scheduler=buildset,
                                                                            size=self.prop_size)
                         self.schedprops.extend(schedpropstoextend)

@@ -145,7 +145,7 @@ class Autobuilder:
     def parseBuilders(self, buildset):
         buildset=buildset
         builders=ast.literal_eval(self.configdict[buildset]['builders'])
-        return builders 
+        return builders
 
     def parseConfig(self):
         import ConfigParser

@@ -255,15 +255,15 @@ class Autobuilder:
                                                               dayOfWeek=builddayOfWeek))
 
 
-    def CreateExtraSchedulerParams(self, name=None, 
-                                         prop_type=None, 
-                                         default=None, 
-                                         choices=None, 
-                                         label=None, 
-                                         required=None, 
+    def CreateExtraSchedulerParams(self, name=None,
+                                         prop_type=None,
+                                         default=None,
+                                         choices=None,
+                                         label=None,
+                                         required=None,
                                          size=None,
                                          scheduler=""):
-        supported_prop_types  = ["ChoiceStringParameter", 
+        supported_prop_types  = ["ChoiceStringParameter",
                          "StringParameter",
                          "FixedParameter",
                          "BooleanParameter"]

@@ -291,7 +291,7 @@ class Autobuilder:
                 default = ""
 
         if prop_type == "ChoiceStringParameter":
-            if choices is None: 
+            if choices is None:
                 try:
                     raise ABConfigError("your config file has a ChoiceStringParameter declaration that has no choices")
                 except ABConfigError, (instance):

@@ -307,25 +307,25 @@ class Autobuilder:
             prop_type = "StringParameter"
 
         if prop_type=="ChoiceStringParameter":
-           schedprops.append(ChoiceStringParameter(name=propid, 
-                                             label=label, 
-                                             required=required, 
+           schedprops.append(ChoiceStringParameter(name=propid,
+                                             label=label,
+                                             required=required,
                                              choices=choices))
         elif prop_type=="StringParameter":
            schedprops.append(StringParameter(name=propid,
-                                             label=label, 
-                                             required=required, 
+                                             label=label,
+                                             required=required,
                                              default=default,
                                              size=size))
         elif prop_type=="FixedParameter":
-           schedprops.append(FixedParameter(name=propid, 
-                                             label=label, 
-                                             required=required, 
+           schedprops.append(FixedParameter(name=propid,
+                                             label=label,
+                                             required=required,
                                              default=default))
         elif prop_type=="BooleanParameter":
-           schedprops.append(BooleanParameter(name=propid, 
-                                             label=label, 
-                                             required=required, 
+           schedprops.append(BooleanParameter(name=propid,
+                                             label=label,
+                                             required=required,
                                              default=default))
         else:
             try:

index 6d318eb..e5a9d5d 100644
@@ -38,12 +38,12 @@ class BuildSet():
                     for layer in layers:
                         kwargs=stepOrder[step]
                         layername=layer.iterkeys().next()
-                        if layer[layer.iterkeys().next()].has_key('checkout') and layer[layer.iterkeys().next()]['checkout'] == False: 
+                        if layer[layer.iterkeys().next()].has_key('checkout') and layer[layer.iterkeys().next()]['checkout'] == False:
                             pass
                         else:
                             if layername == "poky" or layername == 'oecore':
                                 workdir = 'build'
-                            elif "eclipse" in layername: 
+                            elif "eclipse" in layername:
                                 workdir="build"
                             else:
                                 workdir="build/" + layername

@@ -66,7 +66,7 @@ class BuildSet():
                                       scheduler=name,
                                       argdict=layer[layer.iterkeys().next()]))
                         if 'checkout' in layer[layer.iterkeys().next()]:
-                            if layer[layer.iterkeys().next()]['checkout'] == False: 
+                            if layer[layer.iterkeys().next()]['checkout'] == False:
                                 pass
                         else:
                             storedir=None

@@ -114,7 +114,7 @@ class BuildSet():
                     kwargs=stepOrder[step]
                     m = __import__ (step)
                     func = getattr(m, step)
-                    factoryFN(func(locals()['f'+name], 
+                    factoryFN(func(locals()['f'+name],
                               layers,
                               argdict=stepOrder[step]))
                 elif step=="TriggerBuilds":

@@ -124,7 +124,7 @@ class BuildSet():
                     trigger_name = ""
                     waitForFinish = False
                     if 'schedulerName' in stepOrder[step]:
-                        trigger_name = 'trigger_' + stepOrder[step]['schedulerName'] 
+                        trigger_name = 'trigger_' + stepOrder[step]['schedulerName']
                     if 'set_properties' in stepOrder[step]:
                         for p in stepOrder[step]['set_properties'].iterkeys():
                             set_properties[p]=stepOrder[step]['set_properties'][p]

index c06f569..c437cd4 100644
@@ -18,9 +18,9 @@ import os
 from twisted.python import log
 
 class BuildEclipsePlugin(ShellCommand):
-    haltOnFailure = False 
-    flunkOnFailure = True 
-    name = "Building Eclipse Plugin" 
+    haltOnFailure = False
+    flunkOnFailure = True
+    name = "Building Eclipse Plugin"
     def __init__(self, factory, argdict=None, **kwargs):
         self._pendingLogObservers = []
         self.factory = factory

index 02d9b28..9ffc320 100644
@@ -16,9 +16,9 @@ from buildbot.process.buildstep import LogLineObserver
 import os
 
 class BuildToolchainImages(ShellCommand):
-    haltOnFailure = False 
-    flunkOnFailure = True 
-    name = "Building Toolchain Images" 
+    haltOnFailure = False
+    flunkOnFailure = True
+    name = "Building Toolchain Images"
     def __init__(self, factory, argdict=None, **kwargs):
         self.images=""
         self._pendingLogObservers = []

index d56143b..90b90c5 100644
@@ -36,7 +36,7 @@ from buildbot.process import buildstep
 class CheckOutLayers(YoctoGit):
     def __init__(self, factory, scheduler=None, layername=None, mode='full',  storedir=None, mirrordir=None,
                 method='clobber', submodules=False, shallow=False, srcdir='source', workdir='build',
-                timeout=100000, progress=True, retryFetch=True, clobberOnFailure=False, 
+                timeout=100000, progress=True, retryFetch=True, clobberOnFailure=False,
                 getDescription=True, argdict=None,
                  **kwargs):
         self.scheduler = scheduler

@@ -64,8 +64,8 @@ class CheckOutLayers(YoctoGit):
             setattr(self, k, v)
         YoctoGit.__init__(self, repourl=self.repourl, branch=self.branch, mode=self.mode,
                  method=self.method, storedir=self.storedir, mirrordir=mirrordir, submodules=self.submodules, srcdir=self.srcdir+"/"+self.repourl,
-                 workdir=self.workdir, shallow=self.shallow, progress=self.progress, 
-                 retryFetch=self.retryFetch, clobberOnFailure=self.clobberOnFailure, 
+                 workdir=self.workdir, shallow=self.shallow, progress=self.progress,
+                 retryFetch=self.retryFetch, clobberOnFailure=self.clobberOnFailure,
                  getDescription=self.getDescription, layername=self.layername, **kwargs)
 
     def startVC(self, branch, revision, patch):

index 73cf4a6..95180d4 100644
@@ -15,9 +15,9 @@ import os
 from twisted.python import log
 
 class CreateAutoConf(ShellCommand):
-    haltOnFailure = False 
-    flunkOnFailure = True 
-    name = "CreateAutoConf" 
+    haltOnFailure = False
+    flunkOnFailure = True
+    name = "CreateAutoConf"
     def __init__(self, factory, argdict=None, **kwargs):
         self.machine=""
         self.buildapp=""

@@ -159,7 +159,7 @@ class CreateAutoConf(ShellCommand):
         if self.atextappend:
             fout = fout + self.atextappend
 
-        # We have to pass command in as a list due to some weird issue where 
+        # We have to pass command in as a list due to some weird issue where
         # build progress will throw an assert error in stepFinished. This does
         # not happen all the time but when it does happen, just break command
         # up into a list.

index 1ee5261..23b594b 100644
@@ -14,9 +14,9 @@ from buildbot.steps.shell import ShellCommand
 from twisted.python import log
 
 class CreateBBLayersConf(ShellCommand):
-    haltOnFailure = False 
-    flunkOnFailure = True 
-    name = "Create BBLayers Configuration" 
+    haltOnFailure = False
+    flunkOnFailure = True
+    name = "Create BBLayers Configuration"
     def __init__(self, factory, layers, argdict=None, **kwargs):
         self.factory = factory
         self.layers=layers

@@ -45,7 +45,7 @@ class CreateBBLayersConf(ShellCommand):
         #check to see if we have text override
         if self.bbtext != "":
             fout = fout+self.bbtext
-        fout = fout + 'LCONF_VERSION = <LCONF> \n' 
+        fout = fout + 'LCONF_VERSION = <LCONF> \n'
         fout = fout + 'BBPATH = "${TOPDIR}" \n'
         fout = fout + 'BBFILES ?="" \n'
         fout = fout + 'BBLAYERS += " \ \n'

@@ -57,7 +57,7 @@ class CreateBBLayersConf(ShellCommand):
                 fout = fout + workdir + '/build/meta-x32 \ \n'
         elif self.buildprovider == "oe":
             fout = fout + workdir + "/build/meta \ \n"
-        if self.bsplayer == True: 
+        if self.bsplayer == True:
             if self.bspprovider == "intel":
                 if list(self.layerdirs):
                     for layer in self.layerdirs:

index ff9b9f5..fab1008 100644
@@ -14,9 +14,9 @@ from buildbot.steps.shell import ShellCommand
 from twisted.python import log
 
 class CreateCurrentLink(ShellCommand):
-    haltOnFailure = False 
-    flunkOnFailure = True 
-    name = "CreateCurrentLink" 
+    haltOnFailure = False
+    flunkOnFailure = True
+    name = "CreateCurrentLink"
     def __init__(self, factory, argdict=None, **kwargs):
         for k, v in argdict.iteritems():
             setattr(self, k, v)

index 40f5ce3..2b0e4e7 100644
@@ -12,13 +12,13 @@ __email__ = "[email protected]"
 
 from buildbot.steps.shell import ShellCommand
 from twisted.python import log
-import os, datetime 
+import os, datetime
 from autobuilder.config import *
 
 class CreateIntelBSPPackage(ShellCommand):
-    haltOnFailure = False 
-    flunkOnFailure = True 
-    name = "Creating BSP Packages" 
+    haltOnFailure = False
+    flunkOnFailure = True
+    name = "Creating BSP Packages"
     def __init__(self, factory, argdict=None, **kwargs):
         self.factory = factory
         self.machine = ""

index 8482090..3d4f314 100644
@@ -17,8 +17,8 @@ from twisted.python import log
 from autobuilder.config import *
 
 class GetDistroVersion(ShellCommand):
-    haltOnFailure = False 
-    flunkOnFailure = True 
+    haltOnFailure = False
+    flunkOnFailure = True
     name = "GetDistroVersion"
     def __init__(self, factory, argdict=None, **kwargs):
         for k, v in argdict.iteritems():

index 6c0161d..1e2070a 100644
@@ -17,8 +17,8 @@ from twisted.python import log
 from autobuilder.config import *
 
 class GetLayerVersion(ShellCommand):
-    haltOnFailure = False 
-    flunkOnFailure = False 
+    haltOnFailure = False
+    flunkOnFailure = False
     name = "GetLayerVersion"
     def __init__(self, factory, layerversion=None, workdir='build', argdict=None, **kwargs):
         for k, v in argdict.iteritems():

@@ -35,9 +35,9 @@ class GetLayerVersion(ShellCommand):
         buildername=self.getProperty("buildername")
         log.msg(self.workdir)
         log.msg(self.layerversion)
-       
-        layerconf=self.slaveworkdir + "/" + buildername + "/build/" + self.workdir + "/conf/layer.conf|grep LAYERVERSION_" + self.layerversion 
-        cmd = 'cat ' + layerconf 
+
+        layerconf=self.slaveworkdir + "/" + buildername + "/build/" + self.workdir + "/conf/layer.conf|grep LAYERVERSION_" + self.layerversion
+        cmd = 'cat ' + layerconf
         self.command = cmd
         ShellCommand.start(self)
 

index 9a025ff..32de5cb 100644
@@ -14,9 +14,9 @@ __email__ = "[email protected]"
 from buildbot.steps.shell import ShellCommand
 
 class HelloWorld(ShellCommand):
-    haltOnFailure = True 
-    flunkOnFailure = True 
-    name = "Hello World" 
+    haltOnFailure = True
+    flunkOnFailure = True
+    name = "Hello World"
     def __init__(self, factory, argdict=None, **kwargs):
         self.firstname=""
         self.lastname=""

index 8975857..c52cec9 100644
@@ -14,9 +14,9 @@ from buildbot.steps.shell import ShellCommand
 from twisted.python import log
 
 class CreateCurrentLink(ShellCommand):
-    haltOnFailure = False 
-    flunkOnFailure = False 
-    name = "CreateCurrentLink" 
+    haltOnFailure = False
+    flunkOnFailure = False
+    name = "CreateCurrentLink"
     def __init__(self, factory, argdict=None, **kwargs):
         for k, v in argdict.iteritems():
             setattr(self, k, v)

@@ -26,8 +26,8 @@ class CreateCurrentLink(ShellCommand):
         kwargs['timeout']=self.timeout
         buildername = self.getProperty("buildername")
         branch = self.getProperty("branch_poky")
-        persistdbdir = str(os.environ.get('PERSISTDB_DIR')) 
-        buildhistory = str(os.environ.get('BUILD_HISTORY_COLLECT'')) 
+        persistdbdir = str(os.environ.get('PERSISTDB_DIR'))
+        buildhistory = str(os.environ.get('BUILD_HISTORY_COLLECT''))
         nightly_arch = []
         nightly_arch.append("x86")
         nightly_arch.append("x86-64")

@@ -46,7 +46,7 @@ class CreateCurrentLink(ShellCommand):
             elif "nightly-" + arch in buildername and branch == "master" and buildhistory == "True" and self.sync == "checkin":
                 command=command+"cp -R tmp/cache/bb_persist_data.sqlite3 " \
                                + persistdbdir + "/" + buildername \
-                               + "/" + branch + "/" + self.distro 
+                               + "/" + branch + "/" + self.distro
         ShellCommand.start(self, **kwargs)
 
     def describe(self, done=False):

index 1b41927..ce773d1 100644
@@ -15,9 +15,9 @@ from twisted.python import log
 from autobuilder.config import *
 
 class PrepPkgIndex(ShellCommand):
-    haltOnFailure = False 
-    flunkOnFailure = True 
-    name = "PrepPkgIndex" 
+    haltOnFailure = False
+    flunkOnFailure = True
+    name = "PrepPkgIndex"
     def __init__(self, factory, argdict=None, **kwargs):
         for k, v in argdict.iteritems():
             setattr(self, k, v)

index 00f6852..e23ecbf 100644
@@ -12,14 +12,14 @@ __email__ = "[email protected]"
 
 from buildbot.steps.shell import ShellCommand
 from twisted.python import log
-import os, datetime 
+import os, datetime
 from autobuilder.config import *
 
 class PublishArtifacts(ShellCommand):
 
-    haltOnFailure = False 
-    flunkOnFailure = True 
-    name = "Publishing Artifacts" 
+    haltOnFailure = False
+    flunkOnFailure = True
+    name = "Publishing Artifacts"
     def __init__(self, factory, argdict=None, **kwargs):
         self.factory = factory
         self.description = "Publishing Artifacts"

@@ -44,7 +44,7 @@ class PublishArtifacts(ShellCommand):
         self.layerversion_core = self.getProperty("layerversion_core")
         log.msg(layerversion_yoctobsp)
         self.basedir=os.path.join(os.path.join(
-                                    self.slavedir, buildername), 
+                                    self.slavedir, buildername),
                                     "build/build/")
         command=""
         DATESTAMP=datetime.datetime.now().strftime("%Y%m%d")

@@ -71,20 +71,20 @@ class PublishArtifacts(ShellCommand):
                     command=command+"mkdir -p " + adt_dev_dest + "/adt-ipk;"
                     command=command+"cp -R " + os.path.join(self.basedir, "tmp/deploy/ipk/*") + " " + adt_dev_dest + "/adt-ipk;"
                     command=command+"rsync -av " + os.path.join(self.basedir, "tmp/deploy/ipk/") + " " + DEST + "/ipk;"
-                    command=command+"mkdir -p " + adt_dev_dest + "/rootfs;" 
+                    command=command+"mkdir -p " + adt_dev_dest + "/rootfs;"
                     command=command+"for x in `ls " + DEST + "/machines/qemu/|grep -v tiny`; do ln -s " + DEST + "/machines/qemu/$x " + adt_dev_dest + "/rootfs/$x; done;"
                     if self.layerversion_yocto is not None and int(self.layerversion_yocto) < 2:
-                        command=command+"mv " + adt_dev_dest + "/rootfs/qemux86-64 " + adt_dev_dest + "/rootfs/qemux86_64;" 
+                        command=command+"mv " + adt_dev_dest + "/rootfs/qemux86-64 " + adt_dev_dest + "/rootfs/qemux86_64;"
                 elif artifact == "eclipse-plugin-juno":
                     command=command+"mkdir -p " + DEST + "/eclipse-plugin/juno;"
                     command=command+"cp -R --no-dereference --preserve=links " + \
-                                     os.path.join(os.path.join(self.slavedir, buildername), 
+                                     os.path.join(os.path.join(self.slavedir, buildername),
                                                  "build/scripts/org.*.zip") + \
                                      " " + DEST + "/eclipse-plugin/juno;"
                 elif artifact == "eclipse-plugin-kepler":
                     command=command+"mkdir -p " + DEST + "/eclipse-plugin/kepler;"
                     command=command+"cp -R --no-dereference --preserve=links " + \
-                                     os.path.join(os.path.join(self.slavedir, buildername), 
+                                     os.path.join(os.path.join(self.slavedir, buildername),
                                                  "build/scripts/org.*.zip") + \
                                      " " + DEST + "/eclipse-plugin/kepler;"
                 elif artifact == "build-appliance":

@@ -169,7 +169,7 @@ class PublishArtifacts(ShellCommand):
                     command=command+"echo 'Skipping copy of " + artifact + ".'"
                 else:
                     artifact_name, deploy_image_dir = self.getDeployNames(artifact, buildername)
-                    
+
                     command=command+"mkdir -p " + DEST + "/"+ MACHINE_PUBLISH_DIR +"/" + artifact_name + ";"
                     command=command+"cp -R --no-dereference --preserve=links " + \
                                      deploy_image_dir + \

index c73fd29..b9484e7 100644
@@ -12,13 +12,13 @@ __email__ = "[email protected]"
 
 from buildbot.steps.shell import ShellCommand
 from twisted.python import log
-import os, datetime 
+import os, datetime
 from autobuilder.config import *
 
 class PublishLayerTarballs(ShellCommand):
-    haltOnFailure = False 
-    flunkOnFailure = True 
-    name = "Publishing Layer Tarballs" 
+    haltOnFailure = False
+    flunkOnFailure = True
+    name = "Publishing Layer Tarballs"
     def __init__(self, factory, layername, workdir, argdict=None, **kwargs):
         self.factory = factory
         self.layername = layername

index 88b12bf..c9ca9ad 100644
@@ -16,8 +16,8 @@ from twisted.python import log
 from autobuilder.config import *
 
 class ResolveLayerHead(ShellCommand):
-    haltOnFailure = False 
-    flunkOnFailure = False 
+    haltOnFailure = False
+    flunkOnFailure = False
     name = "ResolveLayerHead"
     def __init__(self, factory, layername=None, scheduler=None, argdict=None, **kwargs):
         self.branch = ""

@@ -46,7 +46,7 @@ class ResolveLayerHead(ShellCommand):
         else:
             self.commit = "HEAD"
         if self.commit == "HEAD":
-            cmd = 'git ls-remote ' + self.repourl + ' refs/heads/' + self.branch + '|cut -f1' 
+            cmd = 'git ls-remote ' + self.repourl + ' refs/heads/' + self.branch + '|cut -f1'
         else:
             cmd = 'echo ' + self.commit
         self.command = cmd

index a7d1a03..c1dd13a 100644
@@ -18,9 +18,9 @@ import os, re
 
 class RunSanityTests(ShellCommand):
 
-    haltOnFailure = False 
-    flunkOnFailure = True 
-    name = "Running Sanity Tests" 
+    haltOnFailure = False
+    flunkOnFailure = True
+    name = "Running Sanity Tests"
     def __init__(self, factory, argdict=None, **kwargs):
         self.factory = factory
         self.testsfailed = 0

index 3063bb2..cf901cb 100644
@@ -12,15 +12,15 @@ __email__ = "[email protected]"
 
 from buildbot.status.results import SUCCESS, WARNINGS, FAILURE, SKIPPED, \
      EXCEPTION, RETRY, worst_status
-import os, datetime 
+import os, datetime
 import cPickle as pickle
 from autobuilder.config import *
 from twisted.python import log
 from buildbot.steps.shell import ShellCommand
 
 class SetDest(ShellCommand):
-    name = "SetDest" 
-    haltOnFailure = True 
+    name = "SetDest"
+    haltOnFailure = True
     flunkOnFailure = True
     name = "Destination"
     description = ["Setting %s" % name]

@@ -49,7 +49,7 @@ class SetDest(ShellCommand):
         else:
             buildername=self.getProperty("buildername")
             self.workdir=os.path.join(self.slaveworkdir, buildername)
-            if str(self.getProperty("custom_release_me_" + buildername)) == "True":             
+            if str(self.getProperty("custom_release_me_" + buildername)) == "True":
                 rel_name = self.getProperty("custom_release_name_"  + buildername)
                 if not rel_name or rel_name == "":
                     rel_name == self.getProperty(commit-description)

@@ -75,7 +75,7 @@ class SetDest(ShellCommand):
                     pickle.dump(data, pfile)
                     pfile.close()
                 # we can't os.path.exists here as we don't neccessarily have
-                # access to the slave dest from master. So we keep a cpickle of 
+                # access to the slave dest from master. So we keep a cpickle of
                 # the dests.
                 try:
                     # if the dictionary entry exists, we increment value by one, then repickle

@@ -87,7 +87,7 @@ class SetDest(ShellCommand):
                 pfile = open(DATA_FILE, 'wb')
                 pickle.dump(data, pfile)
                 pfile.close()
-                
+
                 DEST = os.path.join(DEST, DEST_DATE + "-" + str(REV))
             self.setProperty("DEST", DEST)
             self.finished(SUCCESS)

index d416f4b..50ac9ec 100644
@@ -14,9 +14,9 @@ __email__ = "[email protected]"
 from buildbot.steps.shell import ShellCommand
 
 class Sleep(ShellCommand):
-    haltOnFailure = True 
-    flunkOnFailure = True 
-    name = "Sleep" 
+    haltOnFailure = True
+    flunkOnFailure = True
+    name = "Sleep"
     def __init__(self, factory, argdict=None, **kwargs):
         self.time="0"
         self.funny="False"

@@ -28,13 +28,13 @@ class Sleep(ShellCommand):
                 setattr(self, k, v)
         sleep_quotes = ["Sleep, those little slices of death, how I loathe them.",
                                    "No day is so bad it can't be fixed with a nap.",
-                                   "People who say they sleep like a baby usually don't have one.", 
-                                   "Life is too short to sleep on low thread-count sheets", 
-                                   "Sleep is a symptom of caffeine deprivation.", 
-                                   "Without enough sleep, we all become tall two-year-olds.", 
-                                   "I'm not asleep... but that doesn't mean I'm awake.", 
-                                   "When you have insomnia, you're never really asleep, and you're never really awake.", 
-                                   "Life is something that happens when you can't get to sleep.", 
+                                   "People who say they sleep like a baby usually don't have one.",
+                                   "Life is too short to sleep on low thread-count sheets",
+                                   "Sleep is a symptom of caffeine deprivation.",
+                                   "Without enough sleep, we all become tall two-year-olds.",
+                                   "I'm not asleep... but that doesn't mean I'm awake.",
+                                   "When you have insomnia, you're never really asleep, and you're never really awake.",
+                                   "Life is something that happens when you can't get to sleep.",
                                    "Sleeping is no mean art:  for its sake one must stay awake all day.",
                                    "I count it as a certainty that in paradise, everyone naps.",
                                    "Early to rise and early to bed, makes a man healthy and wealthy and dead.",

index 68e887f..78c5abc 100644
@@ -17,9 +17,9 @@ from autobuilder.config import *
 import os
 
 class SyncPersistDB(ShellCommand):
-    haltOnFailure = False 
-    flunkOnFailure = True 
-    name = "syncing persistdb" 
+    haltOnFailure = False
+    flunkOnFailure = True
+    name = "syncing persistdb"
     def __init__(self, factory, argdict=None, **kwargs):
         self._pendingLogObservers = []
         self.factory = factory

index a57f6bb..f0134a9 100644
@@ -13,8 +13,8 @@ from buildbot.steps.shell import ShellCommand
 from buildbot.status.results import FAILURE
 
 class TestFailStep(ShellCommand):
-    haltOnFailure = False 
-    flunkOnFailure = True 
+    haltOnFailure = False
+    flunkOnFailure = True
     name = "TestFailStep"
     def __init__(self, factory, argdict=None, **kwargs):
         for k, v in argdict.iteritems():

index 92e1f0b..1b8de27 100644
@@ -17,7 +17,7 @@ class YoctoBlocker(Blocker):
         builderStatus = builder.builder_status
         matchingBuild = None
 
-        all_builds = builderStatus.getCurrentBuilds() 
+        all_builds = builderStatus.getCurrentBuilds()
 
         for buildStatus in all_builds:
             if self.buildsMatch(myBuildStatus, buildStatus):

new file mode 100644
index 0000000..533bba6
@@ -0,0 +1,18 @@
+[nightly-world-uclibc]
+builders: 'builder1'
+repos: [{'poky':
+            {'repourl':'git://git.yoctoproject.org/poky',
+             'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp'},
+             'branch':'master'}},
+        {'meta-qt3':
+            {'repourl':'git://git.yoctoproject.org/meta-qt3',
+             'branch':'master'}}]
+steps: [{'SetDest':{}},
+        {'CheckOutLayers': {}},
+        {'RunPreamble': {}},
+        {'GetDistroVersion' : {'distro': 'poky'}},
+        {'CreateAutoConf': {'machine': 'qemux86', 'SDKMACHINE' : 'x86_64', 'multilib': True, 'distro': 'poky', 'atextappend' : '\nTCLIBC="uclibc"\n' }},
+        {'CreateBBLayersConf': {'buildprovider' : 'yocto'}},
+        {'BuildImages': {'images': 'world'}},
+        {'PublishArtifacts': {'artifacts': ['ipk', 'rpm', 'deb']}}]
+

new file mode 100755
index 0000000..153f18d
@@ -0,0 +1,125 @@
+#!/usr/bin/python
+'''
+Created on Feb 19, 2014
+
+__author__ = "Richard Purdie"
+__copyright__ = "Copyright 2014, Linux Foundation"
+__credits__ = ["Richard Purdie"]
+__license__ = "GPL"
+__version__ = "2.0"
+__maintainer__ = "Richard Purdie"
+__email__ = "[email protected]"
+'''
+
+from __future__ import print_function
+import signal
+import os
+import sys
+import ConfigParser
+import threading
+import time
+
+if len(sys.argv) < 2:
+    print("Please specify the path to the config file on the commandline as the first argument")
+    sys.exit(1)
+
+config = ConfigParser.ConfigParser()
+config.read(sys.argv[1])
+
+sections = {}
+for section in config.sections():
+    sections[section] = dict(config.items(section))
+
+if "GitSettings" not in sections:
+    print("There is no GitSettings section in the configuration file?")
+    sys.exit(1)
+
+gitsettings = sections["GitSettings"]
+
+if "ogit_trash_dir" not in gitsettings:
+    print("Please set OGIT_TRASH_DIR in the configuration file")
+    sys.exit(1)
+
+if "ogit_mirror_dir" not in gitsettings:
+    print("Please set OGIT_MIRROR_DIR in the configuration file")
+    sys.exit(1)
+
+trashdir = gitsettings["ogit_trash_dir"].replace('"','').replace("'",'')
+mirrordir = gitsettings["ogit_mirror_dir"].replace('"','').replace("'",'')
+
+mirrorlist = [
+    "git://git.yoctoproject.org/meta-fsl-arm",
+    "git://git.yoctoproject.org/meta-fsl-ppc",
+    "git://git.yoctoproject.org/meta-intel",
+    "git://git.yoctoproject.org/meta-minnow",
+    "git://git.yoctoproject.org/meta-qt3",
+    "git://git.yoctoproject.org/poky",
+    "git://git.yoctoproject.org/eclipse-poky-kepler",
+    "git://git.yoctoproject.org/eclipse-poky-juno"
+]
+
+def trash_processor(trashdir):
+    print("Monitoring trashdir %s" % trashdir)
+    if not os.path.exists(trashdir):
+        os.makedirs(trashdir)
+    if trashdir == "/":
+        print("Not prepared to use a trashdir of /")
+        return
+    while True:
+        files = os.listdir(trashdir)
+        if files:
+            os.system("ionice -c 3 rm %s -rf" % trashdir)
+        else:
+            time.sleep(30*60) # 30 minutes
+    return
+
+def mirror_processor(mirrordir):
+    print("Updating mirrors in %s" % mirrordir)
+    mirrorpaths = []
+    for mirror in mirrorlist:
+        mirrorpaths.append(os.path.join(mirrordir, mirror.split("/")[2], mirror.split("/", 3)[3]))
+        if not os.path.exists(mirrorpaths[-1] + "/.git/"):
+            os.system("git clone %s %s" % (mirror, mirrorpaths[-1]))
+    while True:
+        for path in mirrorpaths:
+            os.chdir(path)
+            os.system("git fetch --all")
+        time.sleep(30*60) # 30 minutes
+    return
+
+#Check to see if this is running already. If so, kill it and rerun
+if os.path.exists('/tmp/.buildslave-janitor') and os.path.isfile('/tmp/.buildslave-janitor'):
+    print("A prior PID file exists. Attempting to kill.")
+    with open('/tmp/.buildslave-janitor', 'r') as f:
+        pid=f.readline()
+    try: 
+        os.kill(int(pid), signal.SIGKILL)
+        # We need to sleep for a second or two just to give the SIGKILL time
+        time.sleep(2)
+    except OSError as ex:
+        print("""We weren't able to kill the prior buildslave-janitor. Trying again.""")
+        pass
+    # Check if the process that we killed is alive.
+    try: 
+       os.kill(int(pid), 0)
+    except OSError as ex:
+       pass
+elif os.path.exists('/tmp/.buildslave-janitor') and not os.path.isfile('/tmp/.buildslave-janitor'):
+    raise Exception("""/tmp/.buildslave-janitor is a director. remove it to continue.""")
+try:
+    os.unlink('/tmp/.buildslave-janitor')
+except:
+    pass
+with open('/tmp/.buildslave-janitor', 'w') as f:
+    print(os.getpid(), file=f)
+
+threads = []
+threads.append(threading.Thread(target=trash_processor, args=(trashdir,)))
+threads[-1].start()
+threads.append(threading.Thread(target=mirror_processor, args=(mirrordir,)))
+threads[-1].start()
+
+# wait for all threads to finish
+for t in threads:
+    t.join()
+sys.exit(0)

index 8fa7768..68e887f 100644
@@ -41,9 +41,10 @@ class SyncPersistDB(ShellCommand):
         self.buildername=self.getProperty("buildername")
         self.branch=self.getProperty("branch_poky")
         if self.getProperty("repourl_poky") == "git://git.yoctoproject.org/poky" and os.environ.get('MAINTAIN_PERSISTDB') == "True" and self.branch=="master":
-            self.command = "mkdir -p ./build/tmp/cache/; cp -R " + os.environ.get('PERSISTDB_DIR') + "/" + self.buildername + \
+            self.command = "mkdir -p ./build/tmp/cache/; if [ -b '/tmp/yocto-autobuilder/persistdb/nightly-arm/master/poky/bb_persist_data.sqlite3' ]; " \
+                           "then cp -R " + os.environ.get('PERSISTDB_DIR') + "/" + self.buildername + \
                    "/" + self.branch + "/" + self.distro + \
-                   "/bb_persist_data.sqlite3 ./build/tmp/cache/bb_persist_data.sqlite3 "
+                   "/bb_persist_data.sqlite3 ./build/tmp/cache/bb_persist_data.sqlite3; fi "
             if str(self.commit) == 'True':
                 self.command = "cp -R ./build/tmp/cache/bb_persist_data.sqlite3 " + os.environ.get('PERSISTDB_DIR') + \
                                "/" + self.buildername + "/" + self.branch + "/" + self.distro + "/bb_persist_data.sqlite3"

index 7973a23..19fbb00 100644
@@ -55,7 +55,6 @@ class BuildSet():
                                       argdict=layer[layer.iterkeys().next()]))
                 elif step=="CheckOutLayers":
                 # All steps need the factory passed as the first param
-                    passed=0
                     for layer in layers:
                         kwargs=stepOrder[step]
                         layername=layer.iterkeys().next()

@@ -76,17 +75,15 @@ class BuildSet():
                             mode='full'
                             srcdir = 'source'                       
                             if str(os.environ.get('OPTIMIZED_GIT_CLONE')) == "True":
-                                if passed==0:
+                                if 'poky' in layername or 'oecore' in layername or 'eclipse' in layername:
                                     method='movecopy'
                                     storedir=os.environ.get('OGIT_TRASH_DIR')
                                     mirrordir=os.environ.get('OGIT_MIRROR_DIR')
-                                    passed=1                              
                                 else:
                                     method='barecopy'
                                     storedir=os.environ.get('OGIT_TRASH_DIR')
                                     mirrordir=os.environ.get('OGIT_MIRROR_DIR')
-                                    passed=1                              
-                            if layername == "poky" or layername == 'oecore':
+                            if 'poky' in layername or 'oecore' in layername:
                                 workdir = 'build'
                             elif "eclipse-poky" in layername:
                                 workdir="build/" + layername

new file mode 100644
index 0000000..a95db78
@@ -0,0 +1,26 @@
+[nightly-qa-targetbuilds]
+builders: 'builder1'
+repos: [{'poky':
+            {'repourl':'git://git.yoctoproject.org/poky',
+             'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp'},
+             'branch':'master'}}]
+steps: [{'SetDest':{}},
+        {'CheckOutLayers': {}},
+        {'RunPreamble': {}},
+        {'GetDistroVersion' : {'distro': 'poky'}},
+        {'CreateAutoConf': {'machine': 'qemux86-64', 'SDKMACHINE' : 'x86_64', 'distro': 'poky'}},
+        {'CreateBBLayersConf': {'buildprovider' : 'yocto'}},
+        {'BuildImages': {'images': 'core-image-sato-sdk'}},
+        {'RunSanityTests': {'images': 'core-image-sato-sdk', 'suites' : 'ping ssh buildsudoku buildcvs buildiptables'}},
+        {'CreateAutoConf': {'machine': 'qemux86', 'SDKMACHINE' : 'x86_64', 'distro': 'poky'}},
+        {'BuildImages': {'images': 'core-image-sato-sdk'}},
+        {'RunSanityTests': {'images': 'core-image-sato-sdk', 'suites' : 'ping ssh buildsudoku buildcvs buildiptables'}},
+        {'CreateAutoConf': {'machine': 'qemuarm', 'SDKMACHINE' : 'x86_64', 'distro': 'poky'}},
+        {'BuildImages': {'images': 'core-image-sato-sdk'}},
+        {'RunSanityTests': {'images': 'core-image-sato-sdk', 'suites' : 'ping ssh buildsudoku buildcvs buildiptables'}},
+        {'CreateAutoConf': {'machine': 'qemuppc', 'SDKMACHINE' : 'x86_64', 'distro': 'poky'}},
+        {'BuildImages': {'images': 'core-image-sato-sdk'}},
+        {'RunSanityTests': {'images': 'core-image-sato-sdk', 'suites' : 'ping ssh buildsudoku buildcvs buildiptables'}},
+        {'CreateAutoConf': {'machine': 'qemumips', 'SDKMACHINE' : 'x86_64', 'distro': 'poky'}},
+        {'BuildImages': {'images': 'core-image-sato-sdk'}},
+        {'RunSanityTests': {'images': 'core-image-sato-sdk', 'suites' : 'ping ssh buildsudoku buildcvs buildiptables'}}]

new file mode 100644
index 0000000..42bccde
@@ -0,0 +1,15 @@
+[nightly-oe-selftest]
+builders: 'builder1'
+repos: [{'poky':
+            {'repourl':'git://git.yoctoproject.org/poky',
+             'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp'},
+             'branch':'master'}}]
+steps: [{'SetDest':{}},
+        {'CheckOutLayers': {}},
+        {'RunPreamble': {}},
+        {'GetDistroVersion' : {'distro': 'poky'}},
+        {'CreateAutoConf': {'machine': 'qemux86-64', 'SDKMACHINE' : 'x86_64', 'distro': 'poky', 'nosstate': True, 'packages': 'rpm'}},
+        {'CreateBBLayersConf': {'buildprovider' : 'yocto'}},
+        {'BuildImages': {'images': 'core-image-minimal'}},
+        {'CreateBBLayersConf': {'buildprovider' : 'yocto', 'layerdirs': ['meta-selftest']}},
+        {'RunOeSelftest': {}}]

index 116ee14..bec221a 100644
@@ -38,6 +38,7 @@ class CreateAutoConf(ShellCommand):
         self.factory = factory
         self.buildappsrcrev = "${AUTOREV}"
         self.initmgr=None
+        self.nosstate=False
         self.kwargs = kwargs
         for k, v in argdict.iteritems():
             if type(v) is bool:

@@ -100,9 +101,11 @@ class CreateAutoConf(ShellCommand):
                 elif self.multilib == "lib64":
                     fout = fout + 'MULTILIBS = "multilib:lib64" \n'
                     fout = fout + 'DEFAULTTUNE_virtclass-multilib-lib64 = "x86-64" \n'
-                fout = fout + 'SSTATE_DIR ?= "' + os.environ.get("SSTATE_DIR") + '/multilib" \n'
+                if not self.nosstate:
+                    fout = fout + 'SSTATE_DIR ?= "' + os.environ.get("SSTATE_DIR") + '/multilib" \n'
             else:
-                fout = fout + 'SSTATE_DIR ?= "' + os.environ.get("SSTATE_DIR") + '/" \n'
+                if not self.nosstate:
+                    fout = fout + 'SSTATE_DIR ?= "' + os.environ.get("SSTATE_DIR") + '/" \n'
             if self.gplv3 == "False":
                     fout = fout + 'INCOMPATIBLE_LICENSE = "GPLv3" \n'
             if self.x32 == "True":

new file mode 100644
index 0000000..0efddd7
@@ -0,0 +1,26 @@
+'''
+__author__ = "Stefan Stanacar"
+__copyright__ = "Copyright 2014 Intel Corporation"
+__credits__ = ["Stefan Stanacar"]
+__license__ = "GPL"
+__version__ = "2.0"
+__maintainer__ = "Stefan Stanacar"
+__email__ = "[email protected]"
+'''
+
+
+from buildbot.steps.shell import ShellCommand
+
+class RunOeSelftest(ShellCommand):
+    haltOnFailure = False
+    flunkOnFailure = True
+    name = "Running oe-selftest"
+    def __init__(self, factory, argdict=None, **kwargs):
+        self.factory = factory
+        for k, v in argdict.iteritems():
+                setattr(self, k, v)
+        self.description = "Running oe-selftest"
+        self.timeout = 100000
+        kwargs['timeout']=self.timeout
+        self.command = "if [ -d meta-selftest ]; then . ./oe-init-build-env; oe-selftest; else echo 'Skipping step - no meta-selftest layer here'; fi"
+        ShellCommand.__init__(self, **kwargs)

index 446631d..64dfe06 100644
@@ -246,10 +246,17 @@ class YoctoGit(Source):
                 log.msg("Source step failed while running command %s" % cmd)
                 raise buildstep.BuildStepFailed()
         d.addCallback(lambda _: evaluateCommand(cmd))
+        if self.mirrordir:
+            mirror = self.mirrordir + "/" + self.repourl.replace("git://", "") + "/"
+            if self.pathExists(mirror):
+                self.srcdir=mirror
+            else:
+                self.srcdir='source/'+self.repourl
+        if self.layername == "poky" or self.layername == "oecore" or "eclipse" in self.layername:
+            self.todir = "build/"
+        else:
+            self.todir = "build/" + self.layername
 
-        self.workdir = 'source/'+self.repourl
-        self.srcdir='source/'+self.repourl
-        self.todir = "build/" + self.layername
         d.addCallback(lambda _: self.incremental())
         def copy(_):
             cmd = buildstep.RemoteCommand('cpdir',

@@ -465,8 +472,6 @@ class YoctoGit(Source):
             args += ['--depth', '1']
         command = ['clone'] + args + [self.repourl, '.']
 
-        import os
-
         mirror = None
         if self.mirrordir:
             mirror = self.mirrordir + "/" + self.repourl.replace("git://", "") + "/"

index 19fbb00..6d318eb 100644
@@ -73,7 +73,7 @@ class BuildSet():
                             mirrordir=None
                             method = 'clobber'
                             mode='full'
-                            srcdir = 'source'                       
+                            srcdir = 'source'
                             if str(os.environ.get('OPTIMIZED_GIT_CLONE')) == "True":
                                 if 'poky' in layername or 'oecore' in layername or 'eclipse' in layername:
                                     method='movecopy'

index bc5d9b3..c06f569 100644
@@ -40,7 +40,7 @@ class BuildEclipsePlugin(ShellCommand):
         buildername=self.getProperty("buildername")
         oldbuildername=buildername.replace("plugin", "poky")
         branch=self.getProperty("branch")
-        eclipsehome=self.slaveworkdir + "/" + buildername + '/build/' + oldbuildername
+        eclipsehome=self.slaveworkdir + "/" + buildername + '/build'
         self.command='cd ' + eclipsehome + '/scripts/; ./setup.sh; ECLIPSE_HOME="' + eclipsehome + '/scripts/eclipse" ./build.sh ' + branch + ' development'
         ShellCommand.start(self)
 

index 1ecd982..085c25f 100644
@@ -2,7 +2,7 @@
 builders: 'builder1'
 repos: [{'poky':
             {'repourl':'git://git.yoctoproject.org/poky',
-	         'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp'},
+             'layerversion':{'core':'meta', 'yoctobsp':'meta-yocto-bsp'},
              'branch':'master'}},
         {'meta-intel':
             {'repourl':'git://git.yoctoproject.org/meta-intel',

@@ -55,7 +55,12 @@ props: [{'release_me':{'prop_type':'ChoiceStringParameter',
         {'send_email':{'prop_type':'ChoiceStringParameter',
                        'choices': ['False', 'True'],
                        'name': 'send_email',
-                       'label':'<h3> Send QA alert emails?:</h3>'}}]
+                       'label':'<h3> Send QA alert emails?:</h3>'}},
+        {'prefered_kernel':{'prop_type':'StringParameter',
+                       'size': 15,
+                       'name': 'prefered_kernel',
+                       'default': 'linux-yocto',
+                       'label':'<hr><h3> PREFERRED_PROVIDER_virtual/kernel (default is "linux-yocto"):</h3>'}}]
 steps: [{'SetDest':{}},
         {'CheckOutLayers': {}},
         {'RunPreamble': {}},

@@ -63,22 +68,25 @@ steps: [{'SetDest':{}},
         {'CreateAutoConf': {'machine': 'qemux86', 'SDKMACHINE' : 'x86_64',
                             'distro': 'poky'}},
         {'CreateBBLayersConf': {'buildprovider' : 'yocto'}},
-        {'RunBitbakeSelftest': {}},
         {'BuildImages': {'images': 'universe -c fetch'}},
         {'TriggerBuilds': {'schedulerName': 'main-build', 'waitForFinish': 'True', 
-                             'schedulerNames': {'minnow': {}, 'minnow-lsb': {},
-                              'nightly-arm': {}, 'nightly-arm-lsb': {},
-                              'nightly-fsl-arm': {}, 'nightly-fsl-arm-lsb': {},
-                              'nightly-fsl-ppc': {}, 'nightly-fsl-ppc-lsb': {},
-                              'nightly-intel-gpl': {}, 'nightly-mips': {},
-                              'nightly-mips-lsb': {}, 'nightly-multilib': {},
-                              'nightly-ppc': {}, 'nightly-ppc-lsb': {},
-                              'nightly-x86-64': {}, 'nightly-x86-64-lsb': {},
-                              'nightly-x86': {}, 'nightly-x86-lsb': {},
-                              'nightly-x32': {}, 'poky-tiny': {}, 'buildtools': {},
-                              'nightly-qa-systemd': {}, 'nightly-qa-extras': {},
-                              'nightly-qa-logrotate': {}, 'nightly-qa-pam': {},
-                              'nightly-qa-skeleton': {}, 'nightly-extras': {}}}},
+                           'schedulerNames': {'minnow': {}, 'minnow-lsb': {},
+                           'nightly-arm': {}, 'nightly-arm-lsb': {},
+                           'nightly-fsl-arm': {}, 'nightly-fsl-arm-lsb': {},
+                           'nightly-fsl-ppc': {}, 'nightly-fsl-ppc-lsb': {},
+                           'nightly-mips': {}, 'nightly-mips-lsb': {}, 
+                           'nightly-multilib': {}, 'nightly-x32': {}, 
+                           'nightly-ppc': {}, 'nightly-ppc-lsb': {},
+                           'nightly-x86-64': {}, 'nightly-x86-64-lsb': {},
+                           'nightly-x86': {}, 'nightly-x86-lsb': {}},
+                           'schedulerNames_nowait' : {'build-appliance': {},
+                           'eclipse-plugin-kepler': {}, 'eclipse-plugin-juno': {},
+                           'nightly-non-gpl3': {}, 'nightly-oecore': {},
+                           'nightly-world':{}, 'nightly-intel-gpl': {},
+                           'poky-tiny': {}, 'buildtools': {},
+                           'nightly-qa-systemd': {}, 'nightly-qa-extras': {},
+                           'nightly-qa-logrotate': {}, 'nightly-qa-pam': {},
+                           'nightly-qa-skeleton': {}}}},
         {'PrepPkgIndex' : {}},
         {'BuildImages': {'images': 'package-index'}},
         {'CreateAutoConf': {'machine': 'atom-pc', 'SDKMACHINE' : 'x86_64',

index bec221a..73cf4a6 100644
@@ -67,6 +67,8 @@ class CreateAutoConf(ShellCommand):
                 fout = fout + 'PACKAGE_CLASSES = "' + " ".join(self.classes) + '"\n'
             else:
                 fout = fout + 'PACKAGE_CLASSES = "package_rpm package_deb package_ipk"\n'
+            if self.getProperty("custom_prefered_kernel") is not None:
+                fout = fout + 'PREFERRED_PROVIDER_virtual/kernel = "' + self.getProperty("custom_prefered_kernel") +'"\n'
             fout = fout + 'BB_NUMBER_THREADS = "' + os.environ.get('BB_NUMBER_THREADS') + '"\n'
             fout = fout + 'PARALLEL_MAKE = "-j ' + os.environ.get('PARALLEL_MAKE') + '"\n'
             fout = fout + 'SDKMACHINE ?= "' + self.SDKMACHINE + '"\n'

index 14b7deb..c73fd29 100644
@@ -35,26 +35,31 @@ class PublishLayerTarballs(ShellCommand):
         DEST=self.getProperty("DEST")
         buildername=self.getProperty("buildername")
         revision = ""
+        self.basedir=os.path.join(os.path.join(os.path.join(
+                                    self.slavedir, buildername), self.workdir))
         if str(os.environ.get('PUBLISH_BUILDS')) == "True":
             if self.getProperty("custom_release_me_"+buildername):
-                revision=self.getProperty("custom_release_name_"+buildername)
+                poky_name = self.getProperty("poky_name")
+                poky_number = self.getProperty("poky_number")
+                yocto_number = self.getProperty("yocto_number")
+                archive_name = self.layername + "-" + poky_name + "-" + poky_number
+                command = " git archive --format=tar HEAD "
+                command = command + "--prefix=" + archive_name + "/"
+                command = command + " | bzip2 -c > " + archive_name + ".tar.bz2; "
+                command = command + "md5sum " + archive_name + ".tar.bz2 >> "
+                command = command + self.layername + "-" + revision + ".tar.bz2.md5sum; "
+                command = command + "mkdir -p " + DEST + "; rsync -av "
+                command = command + archive_name +".tar.bz2* " + DEST
             elif self.getProperty("got_revision_"+self.layername):
                 revision=self.getProperty("got_revision_"+self.layername)
-            if revision is not "":
-                self.basedir=os.path.join(os.path.join(os.path.join(
-                                            self.slavedir, buildername), self.workdir))
+                archive_name = self.layername + "-" + revision
                 command = " git archive --format=tar HEAD "
                 command = command + "--prefix=" + self.layername + "-" + revision + "/"
-                command = command + " | gzip > " + self.layername + "-" + revision + ".tar.gz; "
-                command = command + " git archive --format=tar HEAD "
-                command = command + "--prefix=" + self.layername + "-" + revision + "/"
                 command = command + " | bzip2 -c > " + self.layername + "-" + revision + ".tar.bz2; "
                 command = command + "md5sum " + self.layername + "-" + revision + ".tar.bz2 >> "
                 command = command + self.layername + "-" + revision + ".tar.bz2.md5sum; "
-                command = command + "md5sum " + self.layername + "-" + revision + ".tar.gz >> "
-                command = command + self.layername + "-" + revision + ".tar.gz.md5sum; "
                 command = command + "mkdir -p " + DEST + "; rsync -av "
-                command = command + self.layername + "-" + revision +".tar.* " + DEST
+                command = command + archive_name +".tar.bz2* " + DEST
                 self.command=command
             else:
                 self.command="echo 'No revision found. Skipping tarball'"

index a375df6..f23f708 100644
@@ -31,7 +31,7 @@ class Trigger(LoggingBuildStep):
     def __init__(self, schedulerNames=[], sourceStamp = None, sourceStamps = None,
                  updateSourceStamp=None, alwaysUseLatest=False,
                  waitForFinish=False, set_properties={}, 
-                 copy_properties=[], **kwargs):
+                 copy_properties=[], noWait=[], **kwargs):
         if not schedulerNames:
             config.error(
                 "You must specify a scheduler to trigger")

@@ -46,6 +46,7 @@ class Trigger(LoggingBuildStep):
                 "You can't specify both alwaysUseLatest and updateSourceStamp"
             )
         self.schedulerNames = schedulerNames
+        self.noWait = noWait
         self.sourceStamps = sourceStamps or []
         if sourceStamp:
             self.sourceStamps.append(sourceStamp)

@@ -146,12 +147,22 @@ class Trigger(LoggingBuildStep):
         ss_for_trigger = self.prepareSourcestampListForTrigger()
 
         dl = []
+        nowait = []
         triggered_names = []
         for sch in triggered_schedulers:
-            dl.append(sch.trigger(ss_for_trigger, set_props=props_to_set))
+            if sch.name in self.noWait:
+                import time
+                time.sleep(5)
+                nowait.append(sch.trigger(ss_for_trigger, set_props=props_to_set))
+            else:
+                dl.append(sch.trigger(ss_for_trigger, set_props=props_to_set))
             triggered_names.append(sch.name)
         self.step_status.setText(['triggered'] + triggered_names)
 
+        for d in nowait:
+            d.addErrback(log.err,
+                '(ignored) while invoking Triggerable schedulers:')
+
         if self.waitForFinish:
             rclist = yield defer.DeferredList(dl, consumeErrors=1)
         else:

index 0998ee3..b34a60d 100755
@@ -51,14 +51,14 @@ if os.path.isfile(os.path.join(AB_BASE, ".setupdone")):
     parser = SafeConfigParser()
     parser.read('config/autobuilder.conf')
     print
-    print "Reading " + os.path.join(AB_BASE, "conf/autobuilder.conf")
+    print "Reading " + os.path.join(AB_BASE, "config/autobuilder.conf")
     print 
     os.environ["SLAVEBASEDIR"] = AB_BASE.strip('"') + "/yocto-slave"
     print ' Setting %s to %s' % ("SLAVEBASEDIR", AB_BASE + "/yocto-slave")
     for section_name in parser.sections():
         for name, value in parser.items(section_name):
             print ' Setting %s to %s' % (name.upper(), value)
-            os.environ[name.upper()] = value.strip('"')
+            os.environ[name.upper()] = value.strip('"').strip("'")
             if os.environ[name.upper()].endswith("_DIR"):
                 if not os.path.exists(value):
                     try:

@@ -69,16 +69,20 @@ if os.path.isfile(os.path.join(AB_BASE, ".setupdone")):
     print
 
     if sys.argv[1] == "master" or sys.argv[1] == "both":
-
-       os.chdir(os.path.join(AB_BASE, "yocto-master"))
-       subprocess.call(["make", "start"])
-       os.chdir(AB_BASE)
+        os.chdir(os.path.join(AB_BASE, "yocto-master"))
+        subprocess.call(["make", "start"])
+        os.chdir(AB_BASE)
 
     if sys.argv[1] == "slave" or sys.argv[1] == "both":
-
-       os.chdir(os.path.join(AB_BASE, "yocto-slave"))
-       subprocess.call(["make", "start"])
-       os.chdir(AB_BASE)
+        os.chdir(os.path.join(AB_BASE, "yocto-slave"))
+        subprocess.call(["make", "start"])
+        os.chdir(AB_BASE)
+        if os.environ["OPTIMIZED_GIT_CLONE"] == "True":
+            os.chdir(AB_BASE)
+            subprocess.Popen("python bin/buildslave-janitor " + os.path.join(AB_BASE, "config/autobuilder.conf"), 
+                           shell=True, stdin=None, 
+                           stdout=None, stderr=None, 
+                           close_fds=True)
 else:
     print "You have not sourced ./yocto-autobuilder-setup. Please do so first!"
     print ""

53 lines not on this page · raw message

index 3e01568..ae720cd 100644
@@ -148,7 +148,7 @@ class CopyDirectory(base.Command):
         fromdir = os.path.join(self.builder.basedir, args['fromdir'])
         todir = os.path.join(self.builder.basedir, args['todir'])
 
-        self.timeout = args.get('timeout', 120)
+        self.timeout = args.get('timeout', 1200)
         self.maxTime = args.get('maxTime', None)
 
         if runtime.platformType != "posix":

@@ -197,7 +197,7 @@ class Move(base.Command):
         fromdir = os.path.join(self.builder.basedir, args['fromdir'])
         todir = args['todir']
 
-        self.timeout = args.get('timeout', 120)
+        self.timeout = args.get('timeout', 1200)
         self.maxTime = args.get('maxTime', None)
 
         if runtime.platformType != "posix":