summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-03-22 14:43:35 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-23 13:19:49 +0000
commit0a435c7e6ac88c5e099b12f6a90cd96155fe18f2 (patch)
treecaf8a395489cc368413e0f0c9a6bcb0d3b242dbe /meta
parenta247553bb3873590c53f654bfd5310fa5ffdb8ea (diff)
downloadpoky-0a435c7e6ac88c5e099b12f6a90cd96155fe18f2.tar.gz
oeqa: use WORKDIR/oe-testimage-repo to look for RPM packages
Using RPM deploy dir was causing errors when pre-built images were used with these steps: https://wiki.yoctoproject.org/wiki/Quality_Assurance_yocto_project [YOCTO #11173] (From OE-Core rev: f633abed51ed19522340b1d923ffc12ed7e291d6) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/runtime/cases/dnf.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/runtime/cases/dnf.py b/meta/lib/oeqa/runtime/cases/dnf.py
index 59a263dc63..eb3af07f0f 100644
--- a/meta/lib/oeqa/runtime/cases/dnf.py
+++ b/meta/lib/oeqa/runtime/cases/dnf.py
@@ -98,7 +98,7 @@ class DnfRepoTest(DnfTest):
98 @OETestDepends(['dnf.DnfRepoTest.test_dnf_install_from_disk']) 98 @OETestDepends(['dnf.DnfRepoTest.test_dnf_install_from_disk'])
99 def test_dnf_install_from_http(self): 99 def test_dnf_install_from_http(self):
100 output = subprocess.check_output('%s %s -name run-postinsts-dev*' % (bb.utils.which(os.getenv('PATH'), "find"), 100 output = subprocess.check_output('%s %s -name run-postinsts-dev*' % (bb.utils.which(os.getenv('PATH'), "find"),
101 self.tc.td['DEPLOY_DIR_RPM']), shell=True).decode("utf-8") 101 os.path.join(self.tc.td['WORKDIR'], 'oe-testimage-repo')), shell=True).decode("utf-8")
102 rpm_path = output.split("/")[-2] + "/" + output.split("/")[-1] 102 rpm_path = output.split("/")[-2] + "/" + output.split("/")[-1]
103 url = 'http://%s:%s/%s' %(self.target.server_ip, self.repo_server.port, rpm_path) 103 url = 'http://%s:%s/%s' %(self.target.server_ip, self.repo_server.port, rpm_path)
104 self.dnf_with_repo('remove -y run-postinsts-dev') 104 self.dnf_with_repo('remove -y run-postinsts-dev')