summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2018-11-26 16:54:53 +0100
committerGitHub <noreply@github.com>2018-11-26 16:54:53 +0100
commit893dac8ff3e15b90d9c1eab07c47e490cf69b8c6 (patch)
treee15b62c301da88216570a779341bde1e7723a47e
parent13d9d0a9dfd7f4fa54897a0451bfcd85bb12334f (diff)
parentde6008d854ddc94589a050e7eac00ccd1cf072a6 (diff)
downloadmeta-updater-893dac8ff3e15b90d9c1eab07c47e490cf69b8c6.tar.gz
Merge pull request #436 from advancedtelematic/fix/rpi-image-type
oe-selftest: rpi-basic-image is deprecated. Use core-image-basic.
-rw-r--r--lib/oeqa/selftest/cases/updater.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py
index 499ddb7..7e55d07 100644
--- a/lib/oeqa/selftest/cases/updater.py
+++ b/lib/oeqa/selftest/cases/updater.py
@@ -285,9 +285,9 @@ class RpiTests(OESelftestTestCase):
285 285
286 def test_rpi(self): 286 def test_rpi(self):
287 logger = logging.getLogger("selftest") 287 logger = logging.getLogger("selftest")
288 logger.info('Running bitbake to build rpi-basic-image') 288 logger.info('Running bitbake to build core-image-minimal')
289 self.append_config('SOTA_CLIENT_PROV = "aktualizr-auto-prov"') 289 self.append_config('SOTA_CLIENT_PROV = "aktualizr-auto-prov"')
290 bitbake('rpi-basic-image') 290 bitbake('core-image-minimal')
291 credentials = get_bb_var('SOTA_PACKED_CREDENTIALS') 291 credentials = get_bb_var('SOTA_PACKED_CREDENTIALS')
292 # Skip the test if the variable SOTA_PACKED_CREDENTIALS is not set. 292 # Skip the test if the variable SOTA_PACKED_CREDENTIALS is not set.
293 if credentials is None: 293 if credentials is None:
@@ -295,7 +295,7 @@ class RpiTests(OESelftestTestCase):
295 # Check if the file exists. 295 # Check if the file exists.
296 self.assertTrue(os.path.isfile(credentials), "File %s does not exist" % credentials) 296 self.assertTrue(os.path.isfile(credentials), "File %s does not exist" % credentials)
297 deploydir = get_bb_var('DEPLOY_DIR_IMAGE') 297 deploydir = get_bb_var('DEPLOY_DIR_IMAGE')
298 imagename = get_bb_var('IMAGE_LINK_NAME', 'rpi-basic-image') 298 imagename = get_bb_var('IMAGE_LINK_NAME', 'core-image-minimal')
299 # Check if the credentials are included in the output image. 299 # Check if the credentials are included in the output image.
300 result = runCmd('tar -jtvf %s/%s.tar.bz2 | grep sota_provisioning_credentials.zip' % 300 result = runCmd('tar -jtvf %s/%s.tar.bz2 | grep sota_provisioning_credentials.zip' %
301 (deploydir, imagename), ignore_status=True) 301 (deploydir, imagename), ignore_status=True)