From 98b1cb7a2c90a203d885663ed2b6cc1bae08f5b3 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Mon, 7 May 2018 11:24:45 +0200 Subject: Give some more time for checking for successful provisioning. --- lib/oeqa/selftest/cases/updater.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py index 6dcc8df..2efef15 100644 --- a/lib/oeqa/selftest/cases/updater.py +++ b/lib/oeqa/selftest/cases/updater.py @@ -671,12 +671,12 @@ def akt_native_run(testInst, cmd, **kwargs): def verifyProvisioned(testInst, machine): # Verify that device HAS provisioned. ran_ok = False - for delay in [5, 5, 5, 5, 10]: - sleep(delay) + for delay in [5, 5, 5, 5, 10, 10, 10, 10]: stdout, stderr, retcode = testInst.qemu_command('aktualizr-info') if retcode == 0 and stderr == b'' and stdout.decode().find('Fetched metadata: yes') >= 0: ran_ok = True break + sleep(delay) testInst.assertIn(b'Device ID: ', stdout, 'Provisioning failed: ' + stderr.decode() + stdout.decode()) testInst.assertIn(b'Primary ecu hardware ID: ' + machine.encode(), stdout, 'Provisioning failed: ' + stderr.decode() + stdout.decode()) -- cgit v1.2.3-54-g00ecf From a8c4f54b7adbe0169b2ee62a9c8f8911ca9b0bf6 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Mon, 7 May 2018 11:25:03 +0200 Subject: Bump aktualizr. Don't build load tests. --- recipes-sota/aktualizr/aktualizr_git.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index f455013..083f5cc 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb @@ -22,7 +22,7 @@ SRC_URI = " \ file://aktualizr-secondary.socket \ file://aktualizr-serialcan.service \ " -SRCREV = "5fa9a79f1fb29266c862a9a6cb32082bb77844a5" +SRCREV = "617d6d9242239a5719296f18e207ac4d8d94b7b2" BRANCH ?= "master" S = "${WORKDIR}/git" @@ -41,7 +41,8 @@ require garage-sign-version.inc EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF \ -DCMAKE_BUILD_TYPE=Release \ - -DAKTUALIZR_VERSION=${PV} " + -DAKTUALIZR_VERSION=${PV} \ + -DBUILD_LOAD_TESTS=OFF" EXTRA_OECMAKE_append_class-target = " -DBUILD_OSTREE=ON \ -DBUILD_ISOTP=ON \ ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', '-DBUILD_P11=ON', '', d)} " -- cgit v1.2.3-54-g00ecf