[oe-commits] [bitbake] 09/17: toaster: don't use sshbecontroller
git at git.openembedded.org
git at git.openembedded.org
Mon Mar 7 17:24:01 UTC 2016
rpurdie pushed a commit to branch master
in repository bitbake.
commit 3ee06eb7e96de5dba539ad52201867e77d06a53e
Author: Ed Bartosh <ed.bartosh at linux.intel.com>
AuthorDate: Wed Mar 2 21:26:55 2016 -0800
toaster: don't use sshbecontroller
Removed usage of sshbecontroller from bbcontroller, models, tests
and database schema.
Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
Signed-off-by: brian avery <avery.brian at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
lib/toaster/bldcontrol/bbcontroller.py | 6 ------
.../migrations/0002_auto_20160120_1250.py | 19 +++++++++++++++++
lib/toaster/bldcontrol/models.py | 2 --
lib/toaster/bldcontrol/tests.py | 24 ----------------------
4 files changed, 19 insertions(+), 32 deletions(-)
diff --git a/lib/toaster/bldcontrol/bbcontroller.py b/lib/toaster/bldcontrol/bbcontroller.py
index f228d37..f40103c 100644
--- a/lib/toaster/bldcontrol/bbcontroller.py
+++ b/lib/toaster/bldcontrol/bbcontroller.py
@@ -76,13 +76,10 @@ def getBuildEnvironmentController(**kwargs):
"""
from localhostbecontroller import LocalhostBEController
- from sshbecontroller import SSHBEController
be = BuildEnvironment.objects.filter(Q(**kwargs))[0]
if be.betype == BuildEnvironment.TYPE_LOCAL:
return LocalhostBEController(be)
- elif be.betype == BuildEnvironment.TYPE_SSH:
- return SSHBEController(be)
else:
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.
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):
""" Takes a BuildEnvironment object as parameter that points to the settings of the BE.
diff --git a/lib/toaster/bldcontrol/migrations/0002_auto_20160120_1250.py b/lib/toaster/bldcontrol/migrations/0002_auto_20160120_1250.py
new file mode 100644
index 0000000..0c2475a
--- /dev/null
+++ b/lib/toaster/bldcontrol/migrations/0002_auto_20160120_1250.py
@@ -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')]),
+ ),
+ ]
diff --git a/lib/toaster/bldcontrol/models.py b/lib/toaster/bldcontrol/models.py
index bb613c6..9244ed1 100644
--- a/lib/toaster/bldcontrol/models.py
+++ b/lib/toaster/bldcontrol/models.py
@@ -12,10 +12,8 @@ class BuildEnvironment(models.Model):
)
TYPE_LOCAL = 0
- TYPE_SSH = 1
TYPE = (
(TYPE_LOCAL, "local"),
- (TYPE_SSH, "ssh"),
)
LOCK_FREE = 0
diff --git a/lib/toaster/bldcontrol/tests.py b/lib/toaster/bldcontrol/tests.py
index e808991..f20cc7d 100644
--- a/lib/toaster/bldcontrol/tests.py
+++ b/lib/toaster/bldcontrol/tests.py
@@ -9,7 +9,6 @@ from django.test import TestCase
from bldcontrol.bbcontroller import BitbakeController, BuildSetupException
from bldcontrol.localhostbecontroller import LocalhostBEController
-from bldcontrol.sshbecontroller import SSHBEController
from bldcontrol.models import BuildEnvironment, BuildRequest
from bldcontrol.management.commands.runbuilds import Command
@@ -110,29 +109,6 @@ class LocalhostBEControllerTests(TestCase, BEControllerTests):
def _getBEController(self, 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):
def test_bec_select(self):
"""
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list