summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-04-06 17:46:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-06 23:00:10 +0100
commita8f986d73a84f28fa8b116b91fb30c5d2cd4edbe (patch)
tree6a2092276e3b2e80e611c22af1a2b78b9269a6de
parent5d7cce0d0ed70f6b3ebd6cbad300d86964a13398 (diff)
downloadopenembedded-core-contrib-a8f986d73a84f28fa8b116b91fb30c5d2cd4edbe.tar.gz
toaster: remove startBBServer API
We still will have to run bitbake server, but it will be done different way and the code will be in triggerBuild function. Removed startBBServer API from BuildEnvironmentController and LocalhostBEController classes. 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--lib/toaster/bldcontrol/bbcontroller.py9
-rw-r--r--lib/toaster/bldcontrol/localhostbecontroller.py32
2 files changed, 0 insertions, 41 deletions
diff --git a/lib/toaster/bldcontrol/bbcontroller.py b/lib/toaster/bldcontrol/bbcontroller.py
index f40103cb45..535a3986ad 100644
--- a/lib/toaster/bldcontrol/bbcontroller.py
+++ b/lib/toaster/bldcontrol/bbcontroller.py
@@ -127,14 +127,6 @@ class BuildEnvironmentController(object):
bblayerconffile.write("# line added by toaster build control\nBBLAYERS = \"" + " ".join(layerlist) + "\"")
bblayerconffile.close()
- def startBBServer(self):
- """ Starts a BB server with Toaster toasterui set up to record the builds, an no controlling UI.
- After this method executes, self.be bbaddress/bbport MUST point to a running and free server,
- and the bbstate MUST be updated to "started".
- """
- raise NotImplementedError("FIXME: Must override in order to actually start the BB server")
-
-
def setLayers(self, bitbake, ls):
""" Checks-out bitbake executor and layers from git repositories.
Sets the layer variables in the config file, after validating local layer paths.
@@ -151,7 +143,6 @@ class BuildEnvironmentController(object):
starts if needed; or reconnects to the server if we can
"""
if not self.connection:
- self.startBBServer()
self.be.lock = BuildEnvironment.LOCK_RUNNING
self.be.save()
diff --git a/lib/toaster/bldcontrol/localhostbecontroller.py b/lib/toaster/bldcontrol/localhostbecontroller.py
index 08419f2ded..7d6abe69e2 100644
--- a/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -70,38 +70,6 @@ class LocalhostBEController(BuildEnvironmentController):
logger.debug("localhostbecontroller: shellcmd success")
return out
- def startBBServer(self):
- assert self.pokydirname and os.path.exists(self.pokydirname)
- assert self.islayerset
-
- # find our own toasterui listener/bitbake
- from toaster.bldcontrol.management.commands.loadconf import _reduce_canon_path
-
- toaster = _reduce_canon_path(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../../bin/toaster"))
- assert os.path.exists(toaster) and os.path.isfile(toaster)
-
- # restart bitbake server and toastergui observer
- self._shellcmd("bash -c 'source %s restart-bitbake'" % toaster, self.be.builddir)
- logger.debug("localhostbecontroller: restarted bitbake server")
-
- # read port number from bitbake.lock
- self.be.bbport = ""
- bblock = os.path.join(self.be.builddir, 'bitbake.lock')
- if os.path.exists(bblock):
- with open(bblock) as fplock:
- for line in fplock:
- if ":" in line:
- self.be.bbport = line.split(":")[-1].strip()
- logger.debug("localhostbecontroller: bitbake port %s", self.be.bbport)
- break
-
- if not self.be.bbport:
- raise BuildSetupException("localhostbecontroller: can't read bitbake port from %s" % bblock)
-
- self.be.bbaddress = "localhost"
- self.be.bbstate = BuildEnvironment.SERVER_STARTED
- self.be.save()
-
def getGitCloneDirectory(self, url, branch):
"""Construct unique clone directory name out of url and branch."""
if branch != "HEAD":