summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2018-08-08 16:13:08 +0200
committerPatrick Vacek <patrickvacek@gmail.com>2018-08-08 16:15:58 +0200
commitfd2c209f0fd68d0003fbef06ff5fed9f0262453f (patch)
tree918c1e372f2f5c5a821c0aa5758fd19ffcf33531
parent661f27ff1a47b2e0df06c5600443697ab6cab780 (diff)
downloadmeta-updater-bugfix/unknown-signatures-master.tar.gz
aktualizr: bump to latest for key rotation and storage updates.bugfix/unknown-signatures-master
Work around a bug in oe-selftest with migration and aktualizr-info interplay by forcing --allow-migrate for now.
-rw-r--r--lib/oeqa/selftest/cases/updater.py2
-rwxr-xr-xrecipes-sota/aktualizr/aktualizr_git.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py
index e620491..1c5a1dc 100644
--- a/lib/oeqa/selftest/cases/updater.py
+++ b/lib/oeqa/selftest/cases/updater.py
@@ -226,7 +226,7 @@ class ManualControlTests(OESelftestTestCase):
226 Disable the systemd service then run aktualizr manually 226 Disable the systemd service then run aktualizr manually
227 """ 227 """
228 sleep(20) 228 sleep(20)
229 stdout, stderr, retcode = self.qemu_command('aktualizr-info') 229 stdout, stderr, retcode = self.qemu_command('aktualizr-info --allow-migrate')
230 self.assertIn(b'Fetched metadata: no', stdout, 230 self.assertIn(b'Fetched metadata: no', stdout,
231 'Aktualizr should not have run yet' + stderr.decode() + stdout.decode()) 231 'Aktualizr should not have run yet' + stderr.decode() + stdout.decode())
232 232
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 9a0441f..5af36e9 100755
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -26,7 +26,7 @@ SRC_URI = " \
26 file://aktualizr-secondary.socket \ 26 file://aktualizr-secondary.socket \
27 file://aktualizr-serialcan.service \ 27 file://aktualizr-serialcan.service \
28 " 28 "
29SRCREV = "9207f7534a03a09cbc1e8b9c414070210380cab1" 29SRCREV = "a94a15e31f3b973966b1afc9081fc1b17a3b9d48"
30BRANCH ?= "master" 30BRANCH ?= "master"
31 31
32S = "${WORKDIR}/git" 32S = "${WORKDIR}/git"