summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-04-06 17:46:20 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-06 23:10:28 +0100
commit22fba9b2b7982055b54c756cc5bdce05c4a42fdc (patch)
tree2c6ea92d6a13396e9fbb0246eee0b58aab029cac
parent829a0bdb48670b05dfefe071d27033ec046c5c3b (diff)
downloadpoky-22fba9b2b7982055b54c756cc5bdce05c4a42fdc.tar.gz
bitbake: toaster: add brbe parameter to triggerBuild
Called triggerBuild with brbe parameter instead of adding TOASTER_BRBE variable to the database and fetching it in triggerBuild. (Bitbake rev: 669bb3f6865d8bb89cd94ef9d0eba3346c47d7b2) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/toaster/bldcontrol/localhostbecontroller.py2
-rw-r--r--bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py6
2 files changed, 3 insertions, 5 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
index 1ccdd24b89..e588924639 100644
--- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -256,7 +256,7 @@ class LocalhostBEController(BuildEnvironmentController):
256 return open(os.path.join(self.be.builddir, "toaster_server.log"), "r").read() 256 return open(os.path.join(self.be.builddir, "toaster_server.log"), "r").read()
257 257
258 258
259 def triggerBuild(self, bitbake, layers, variables, targets): 259 def triggerBuild(self, bitbake, layers, variables, targets, brbe):
260 # set up the build environment with the needed layers 260 # set up the build environment with the needed layers
261 self.setLayers(bitbake, layers, targets) 261 self.setLayers(bitbake, layers, targets)
262 262
diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py b/bitbake/lib/toaster/bldcontrol/management/commands/runbuilds.py
index 0bd5d08226..8ba836ee4b 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):
49 49
50 logger.debug("runbuilds: starting build %s, environment %s" % (str(br).decode('utf-8'), bec.be)) 50 logger.debug("runbuilds: starting build %s, environment %s" % (str(br).decode('utf-8'), bec.be))
51 51
52 # write the build identification variable
53 BRVariable.objects.create(req = br, name="TOASTER_BRBE", value="%d:%d" % (br.pk, bec.be.pk))
54
55 # let the build request know where it is being executed 52 # let the build request know where it is being executed
56 br.environment = bec.be 53 br.environment = bec.be
57 br.save() 54 br.save()
58 55
59 # this triggers an async build 56 # this triggers an async build
60 bec.triggerBuild(br.brbitbake, br.brlayer_set.all(), br.brvariable_set.all(), br.brtarget_set.all()) 57 bec.triggerBuild(br.brbitbake, br.brlayer_set.all(), br.brvariable_set.all(),
58 br.brtarget_set.all(), "%d:%d" % (br.pk, bec.be.pk))
61 59
62 except Exception as e: 60 except Exception as e:
63 logger.error("runbuilds: Error launching build %s" % e) 61 logger.error("runbuilds: Error launching build %s" % e)