[Toaster] [PATCH v6 10/41] toaster: add brbe parameter to triggerBuild
Ed Bartosh
ed.bartosh at linux.intel.com
Wed Mar 23 01:15:01 PDT 2016
Called triggerBuild with brbe parameter instead of adding TOASTER_BRBE
variable to the database and fetching it in triggerBuild.
Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
---
bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 2 +-
bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
index 1ccdd24..e588924 100644
--- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -256,7 +256,7 @@ class LocalhostBEController(BuildEnvironmentController):
return open(os.path.join(self.be.builddir, "toaster_server.log"), "r").read()
- def triggerBuild(self, bitbake, layers, variables, targets):
+ def triggerBuild(self, bitbake, layers, variables, targets, brbe):
# set up the build environment with the needed layers
self.setLayers(bitbake, layers, targets)
diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py b/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py
index 0bd5d08..8ba836e 100644
--- a/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py
+++ b/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py
@@ -49,15 +49,13 @@ class Command(NoArgsCommand):
logger.debug("runbuilds: starting build %s, environment %s" % (str(br).decode('utf-8'), 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()
# this triggers an async build
- bec.triggerBuild(br.brbitbake, br.brlayer_set.all(), br.brvariable_set.all(), br.brtarget_set.all())
+ bec.triggerBuild(br.brbitbake, br.brlayer_set.all(), br.brvariable_set.all(),
+ br.brtarget_set.all(), "%d:%d" % (br.pk, bec.be.pk))
except Exception as e:
logger.error("runbuilds: Error launching build %s" % e)
--
2.1.4
More information about the toaster
mailing list