From 166917ad9b5b8ff8f180fd6af5b8153f984ade81 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Thu, 4 Oct 2018 16:45:16 +0200 Subject: aktualizr: remove example-interface. --- lib/oeqa/selftest/cases/updater.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py index 7ef834e..7d1f36e 100644 --- a/lib/oeqa/selftest/cases/updater.py +++ b/lib/oeqa/selftest/cases/updater.py @@ -150,8 +150,6 @@ class AutoProvTests(OESelftestTestCase): self.meta_qemu = None self.append_config('MACHINE = "qemux86-64"') self.append_config('SOTA_CLIENT_PROV = " aktualizr-auto-prov "') - # Test aktualizr-example-interface package. - self.append_config('IMAGE_INSTALL_append = " aktualizr-examples aktualizr-example-interface "') self.qemu, self.s = qemu_launch(machine='qemux86-64') def tearDownLocal(self): @@ -185,12 +183,6 @@ class AutoProvTests(OESelftestTestCase): self.assertTrue(ran_ok, 'aktualizr-info failed: ' + stderr.decode() + stdout.decode()) verifyProvisioned(self, machine) - # Test aktualizr-example-interface package. - stdout, stderr, retcode = self.qemu_command('aktualizr-info') - self.assertIn(b'hardware ID: example1', stdout, - 'Legacy secondary initialization failed: ' + stderr.decode() + stdout.decode()) - self.assertIn(b'hardware ID: example2', stdout, - 'Legacy secondary initialization failed: ' + stderr.decode() + stdout.decode()) class ManualControlTests(OESelftestTestCase): @@ -562,6 +554,7 @@ class HsmTests(OESelftestTestCase): verifyProvisioned(self, machine) + class SecondaryTests(OESelftestTestCase): @classmethod def setUpClass(cls): -- cgit v1.2.3-54-g00ecf From 5615b0a72848ae704d277880e3e89040aec54062 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Mon, 29 Oct 2018 11:59:13 +0100 Subject: aktualizr: Remove implicit_writer. It is now unused. Bump to the latest version as well. --- lib/oeqa/selftest/cases/updater.py | 4 +--- recipes-sota/aktualizr/aktualizr_git.bb | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py index 7d1f36e..3c17b8a 100644 --- a/lib/oeqa/selftest/cases/updater.py +++ b/lib/oeqa/selftest/cases/updater.py @@ -102,9 +102,6 @@ class AktualizrToolsTests(OESelftestTestCase): logger.info('Running bitbake to build aktualizr-native tools') bitbake('aktualizr-native') - def test_implicit_writer_help(self): - akt_native_run(self, 'aktualizr_implicit_writer --help') - def test_cert_provider_help(self): akt_native_run(self, 'aktualizr_cert_provider --help') @@ -228,6 +225,7 @@ class ManualControlTests(OESelftestTestCase): self.assertIn(b'Fetched metadata: yes', stdout, 'Aktualizr should have run' + stderr.decode() + stdout.decode()) + class RpiTests(OESelftestTestCase): def setUpLocal(self): diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 9d3c6d8..9823943 100755 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb @@ -27,7 +27,7 @@ SRC_URI = " \ file://aktualizr-serialcan.service \ " -SRCREV = "39acfec48d1cb91e7621c818ac177f6d3c73fecc" +SRCREV = "3c1c77c005fc1f872f1e12080528ed6f8a32bbf3" BRANCH ?= "master" S = "${WORKDIR}/git" @@ -101,7 +101,6 @@ FILES_${PN}-examples = " \ FILES_${PN}-host-tools = " \ ${bindir}/aktualizr-repo \ ${bindir}/aktualizr_cert_provider \ - ${bindir}/aktualizr_implicit_writer \ ${bindir}/garage-deploy \ ${bindir}/garage-push \ ${libdir}/sota/sota_autoprov.toml \ -- cgit v1.2.3-54-g00ecf