summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorAndré Draszik <git@andred.net>2019-12-12 21:52:12 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-16 23:25:49 +0000
commit969b9974c600071a42fd2311ad099d135abb8a3b (patch)
tree9869ea8950856cc760f0e299f65296ba7e42f6ed /meta/lib
parenteeefadc738790975cd8d8c3613a2a285f33751e8 (diff)
downloadpoky-969b9974c600071a42fd2311ad099d135abb8a3b.tar.gz
oeqa/runtime/apt dnf opkg: support running from within docker container
If the user specified an http port to use for serving files, use that instead of a random one. At the same time, have the http server bind to all interfaces. Binding to the server_ip might not always be possible, e.g. in the case of running bitbake / oeqa from within a docker container. In this case, the ip address is valid outside the container, but not inside, and hence can't be bound to. So switch to simply binding to all interfaces. (From OE-Core rev: da529e6522959c2024023e90de52b5e42f160596) Signed-off-by: André Draszik <git@andred.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/runtime/cases/apt.py4
-rw-r--r--meta/lib/oeqa/runtime/cases/dnf.py3
-rw-r--r--meta/lib/oeqa/runtime/cases/opkg.py4
3 files changed, 8 insertions, 3 deletions
diff --git a/meta/lib/oeqa/runtime/cases/apt.py b/meta/lib/oeqa/runtime/cases/apt.py
index 74a940d80f..c5378d90c3 100644
--- a/meta/lib/oeqa/runtime/cases/apt.py
+++ b/meta/lib/oeqa/runtime/cases/apt.py
@@ -22,7 +22,9 @@ class AptRepoTest(AptTest):
22 @classmethod 22 @classmethod
23 def setUpClass(cls): 23 def setUpClass(cls):
24 service_repo = os.path.join(cls.tc.td['DEPLOY_DIR_DEB'], 'all') 24 service_repo = os.path.join(cls.tc.td['DEPLOY_DIR_DEB'], 'all')
25 cls.repo_server = HTTPService(service_repo, cls.tc.target.server_ip, logger=cls.tc.logger) 25 cls.repo_server = HTTPService(service_repo,
26 '0.0.0.0', port=cls.tc.target.server_port,
27 logger=cls.tc.logger)
26 cls.repo_server.start() 28 cls.repo_server.start()
27 29
28 @classmethod 30 @classmethod
diff --git a/meta/lib/oeqa/runtime/cases/dnf.py b/meta/lib/oeqa/runtime/cases/dnf.py
index de3759995e..f40c63026e 100644
--- a/meta/lib/oeqa/runtime/cases/dnf.py
+++ b/meta/lib/oeqa/runtime/cases/dnf.py
@@ -53,7 +53,8 @@ class DnfRepoTest(DnfTest):
53 @classmethod 53 @classmethod
54 def setUpClass(cls): 54 def setUpClass(cls):
55 cls.repo_server = HTTPService(os.path.join(cls.tc.td['WORKDIR'], 'oe-testimage-repo'), 55 cls.repo_server = HTTPService(os.path.join(cls.tc.td['WORKDIR'], 'oe-testimage-repo'),
56 cls.tc.target.server_ip, logger=cls.tc.logger) 56 '0.0.0.0', port=cls.tc.target.server_port,
57 logger=cls.tc.logger)
57 cls.repo_server.start() 58 cls.repo_server.start()
58 59
59 @classmethod 60 @classmethod
diff --git a/meta/lib/oeqa/runtime/cases/opkg.py b/meta/lib/oeqa/runtime/cases/opkg.py
index 750706161b..9cfee1cd88 100644
--- a/meta/lib/oeqa/runtime/cases/opkg.py
+++ b/meta/lib/oeqa/runtime/cases/opkg.py
@@ -25,7 +25,9 @@ class OpkgRepoTest(OpkgTest):
25 if cls.tc.td["MULTILIB_VARIANTS"]: 25 if cls.tc.td["MULTILIB_VARIANTS"]:
26 allarchfeed = cls.tc.td["TUNE_PKGARCH"] 26 allarchfeed = cls.tc.td["TUNE_PKGARCH"]
27 service_repo = os.path.join(cls.tc.td['DEPLOY_DIR_IPK'], allarchfeed) 27 service_repo = os.path.join(cls.tc.td['DEPLOY_DIR_IPK'], allarchfeed)
28 cls.repo_server = HTTPService(service_repo, cls.tc.target.server_ip, logger=cls.tc.logger) 28 cls.repo_server = HTTPService(service_repo,
29 '0.0.0.0', port=cls.tc.target.server_port,
30 logger=cls.tc.logger)
29 cls.repo_server.start() 31 cls.repo_server.start()
30 32
31 @classmethod 33 @classmethod