aboutsummaryrefslogtreecommitdiffstats
path: root/lib/toaster/bldcontrol/management/commands/runbuilds.py
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2015-01-28 13:18:09 +0000
committerAlexandru DAMIAN <alexandru.damian@intel.com>2015-01-30 14:18:29 +0000
commitc6eb0f7f16c59530c2525b2e5629fe86de4e8f0f (patch)
tree66ab0748fc1ca6313d1cc7addb31a6699ed17e21 /lib/toaster/bldcontrol/management/commands/runbuilds.py
parent90ef8975f35e2da824bc1c80e41ca26d9af0b208 (diff)
downloadbitbake-contrib-c6eb0f7f16c59530c2525b2e5629fe86de4e8f0f.tar.gz
toaster: new layer checkout logic
This patch implements a new layer checkout logic that brings more flexibility in getting layers under different commits work with Toaster. The new hibrid logic will checkout separately each layer and commit id; the task execution will be delegated to the checkedout bitbake, but the data logger will be executed from the current toaster version as to bring in enough data to sustain the updates in UI models. [YOCTO #7171] [YOCTO #6892] Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Diffstat (limited to 'lib/toaster/bldcontrol/management/commands/runbuilds.py')
-rw-r--r--lib/toaster/bldcontrol/management/commands/runbuilds.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/toaster/bldcontrol/management/commands/runbuilds.py b/lib/toaster/bldcontrol/management/commands/runbuilds.py
index bdce6ee90..23ee85555 100644
--- a/lib/toaster/bldcontrol/management/commands/runbuilds.py
+++ b/lib/toaster/bldcontrol/management/commands/runbuilds.py
@@ -2,7 +2,7 @@ from django.core.management.base import NoArgsCommand, CommandError
from django.db import transaction
from orm.models import Build
from bldcontrol.bbcontroller import getBuildEnvironmentController, ShellCmdException, BuildSetupException
-from bldcontrol.models import BuildRequest, BuildEnvironment, BRError
+from bldcontrol.models import BuildRequest, BuildEnvironment, BRError, BRVariable
import os
import logging
@@ -47,6 +47,9 @@ class Command(NoArgsCommand):
return
logger.debug("runbuilds: starting build %s, environment %s" % (br, bec.be))
+
+ # write the build identification variable
+ BRVariable.objects.create(req = br, name="TOASTER_BRBE", value="%d:%d" % (br.pk, bec.be.pk))
# let the build request know where it is being executed
br.environment = bec.be
br.save()
@@ -56,7 +59,7 @@ class Command(NoArgsCommand):
bec.writePreConfFile(br.brvariable_set.all())
# get the bb server running with the build req id and build env id
- bbctrl = bec.getBBController("%d:%d" % (br.pk, bec.be.pk))
+ bbctrl = bec.getBBController()
# trigger the build command
task = reduce(lambda x, y: x if len(y)== 0 else y, map(lambda y: y.task, br.brtarget_set.all()))