bitbake: toaster: don't use sshbecontroller

Removed usage of sshbecontroller from bbcontroller, models, tests
and database schema.

(Bitbake rev: 3ee06eb7e96de5dba539ad52201867e77d06a53e)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh 2016-03-02 21:26:55 -08:00 committed by Richard Purdie
parent 790b2d1387
commit 3db71b4087
4 changed files with 19 additions and 32 deletions

View File

@ -76,13 +76,10 @@ def getBuildEnvironmentController(**kwargs):
""" """
from localhostbecontroller import LocalhostBEController from localhostbecontroller import LocalhostBEController
from sshbecontroller import SSHBEController
be = BuildEnvironment.objects.filter(Q(**kwargs))[0] be = BuildEnvironment.objects.filter(Q(**kwargs))[0]
if be.betype == BuildEnvironment.TYPE_LOCAL: if be.betype == BuildEnvironment.TYPE_LOCAL:
return LocalhostBEController(be) return LocalhostBEController(be)
elif be.betype == BuildEnvironment.TYPE_SSH:
return SSHBEController(be)
else: else:
raise Exception("FIXME: Implement BEC for type %s" % str(be.betype)) raise Exception("FIXME: Implement BEC for type %s" % str(be.betype))
@ -105,9 +102,6 @@ class BuildEnvironmentController(object):
on the local machine, with the "build/" directory under the "poky/" source checkout directory. on the local machine, with the "build/" directory under the "poky/" source checkout directory.
Bash is expected to be available. Bash is expected to be available.
* SSH controller will run the Toaster BE on a remote machine, where the current user
can connect without raise Exception("FIXME: implement")word (set up with either ssh-agent or raise Exception("FIXME: implement")phrase-less key authentication)
""" """
def __init__(self, be): def __init__(self, be):
""" Takes a BuildEnvironment object as parameter that points to the settings of the BE. """ Takes a BuildEnvironment object as parameter that points to the settings of the BE.

View File

@ -0,0 +1,19 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('bldcontrol', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='buildenvironment',
name='betype',
field=models.IntegerField(choices=[(0, b'local')]),
),
]

View File

@ -12,10 +12,8 @@ class BuildEnvironment(models.Model):
) )
TYPE_LOCAL = 0 TYPE_LOCAL = 0
TYPE_SSH = 1
TYPE = ( TYPE = (
(TYPE_LOCAL, "local"), (TYPE_LOCAL, "local"),
(TYPE_SSH, "ssh"),
) )
LOCK_FREE = 0 LOCK_FREE = 0

View File

@ -9,7 +9,6 @@ from django.test import TestCase
from bldcontrol.bbcontroller import BitbakeController, BuildSetupException from bldcontrol.bbcontroller import BitbakeController, BuildSetupException
from bldcontrol.localhostbecontroller import LocalhostBEController from bldcontrol.localhostbecontroller import LocalhostBEController
from bldcontrol.sshbecontroller import SSHBEController
from bldcontrol.models import BuildEnvironment, BuildRequest from bldcontrol.models import BuildEnvironment, BuildRequest
from bldcontrol.management.commands.runbuilds import Command from bldcontrol.management.commands.runbuilds import Command
@ -110,29 +109,6 @@ class LocalhostBEControllerTests(TestCase, BEControllerTests):
def _getBEController(self, obe): def _getBEController(self, obe):
return LocalhostBEController(obe) return LocalhostBEController(obe)
class SSHBEControllerTests(TestCase, BEControllerTests):
def __init__(self, *args):
super(SSHBEControllerTests, self).__init__(*args)
def _getBuildEnvironment(self):
return BuildEnvironment.objects.create(
lock = BuildEnvironment.LOCK_FREE,
betype = BuildEnvironment.TYPE_SSH,
address = test_address,
sourcedir = test_sourcedir,
builddir = test_builddir )
def _getBEController(self, obe):
return SSHBEController(obe)
def test_pathExists(self):
obe = BuildEnvironment.objects.create(betype = BuildEnvironment.TYPE_SSH, address= test_address)
sbc = SSHBEController(obe)
self.assertTrue(sbc._pathexists("/"))
self.assertFalse(sbc._pathexists("/.deadbeef"))
self.assertTrue(sbc._pathexists(sbc._shellcmd("pwd")))
class RunBuildsCommandTests(TestCase): class RunBuildsCommandTests(TestCase):
def test_bec_select(self): def test_bec_select(self):
""" """