aboutsummaryrefslogtreecommitdiffstats
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-22 15:09:26 +0000
commitf633abed51ed19522340b1d923ffc12ed7e291d6 (patch)
treef684cff1e60ce92dedb343e67f43f9c630dc95f9
parentacbeaa37554f3546b036ff8ef9aebfe00f2537c6 (diff)
downloadopenembedded-core-contrib-f633abed51ed19522340b1d923ffc12ed7e291d6.tar.gz
openembedded-core-contrib-f633abed51ed19522340b1d923ffc12ed7e291d6.tar.bz2
openembedded-core-contrib-f633abed51ed19522340b1d923ffc12ed7e291d6.zip
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] Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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):
@OETestDepends(['dnf.DnfRepoTest.test_dnf_install_from_disk'])
def test_dnf_install_from_http(self):
output = subprocess.check_output('%s %s -name run-postinsts-dev*' % (bb.utils.which(os.getenv('PATH'), "find"),
- self.tc.td['DEPLOY_DIR_RPM']), shell=True).decode("utf-8")
+ os.path.join(self.tc.td['WORKDIR'], 'oe-testimage-repo')), shell=True).decode("utf-8")
rpm_path = output.split("/")[-2] + "/" + output.split("/")[-1]
url = 'http://%s:%s/%s' %(self.target.server_ip, self.repo_server.port, rpm_path)
self.dnf_with_repo('remove -y run-postinsts-dev')