Merge pull request #512 from advancedtelematic/fix/latest-aktualizr

aktualizr: Bump to latest for recovery fixes.

2 files changed, 11 insertions, 10 deletions

diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64.py b/lib/oeqa/selftest/cases/updater_qemux86_64.py
index bef6cdc..9f32bcf 100644
--- a/lib/oeqa/selftest/cases/updater_qemux86_64.py
+++ b/lib/oeqa/selftest/cases/updater_qemux86_64.py
@@ -341,11 +341,6 @@ class SecondaryTests(OESelftestTestCase):
         self.assertEqual(retcode, 0, "Unable to run aktualizr-secondary --help")
         self.assertEqual(stderr, b'', 'Error: ' + stderr.decode())
 
-    def test_secondary_listening(self):
-        print('Checking aktualizr-secondary service is listening')
-        stdout, stderr, retcode = self.qemu_command('aktualizr-check-discovery')
-        self.assertEqual(retcode, 0, "Unable to connect to secondary")
-
 
 class PrimaryTests(OESelftestTestCase):
     def setUpLocal(self):
@@ -413,11 +408,18 @@ class ResourceControlTests(OESelftestTestCase):
 
     def test_aktualizr_resource_control(self):
         print('Checking aktualizr was killed')
-        stdout, stderr, retcode = self.qemu_command('systemctl --no-pager show aktualizr')
+        ran_ok = False
+        for delay in [5, 5, 5, 5]:
+            sleep(delay)
+            stdout, stderr, retcode = self.qemu_command('systemctl --no-pager show aktualizr')
+            if retcode == 0 and b'ExecMainStatus=9' in stdout:
+                ran_ok = True
+                break
+        self.assertTrue(ran_ok, 'Aktualizr was not killed')
+
         self.assertIn(b'CPUWeight=1000', stdout, 'CPUWeight was not set correctly')
         self.assertIn(b'MemoryHigh=52428800', stdout, 'MemoryHigh was not set correctly')
         self.assertIn(b'MemoryMax=1048576', stdout, 'MemoryMax was not set correctly')
-        self.assertIn(b'ExecMainStatus=9', stdout, 'Aktualizr was not killed')
 
         self.qemu_command('systemctl --runtime set-property aktualizr MemoryMax=')
         self.qemu_command('systemctl restart aktualizr')
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 64382d8..c0e275d 100755
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -7,8 +7,7 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=9741c346eef56131163e13b9db1241b3"
 
 DEPENDS = "boost curl openssl libarchive libsodium sqlite3 asn1c-native"
 DEPENDS_append = "${@bb.utils.contains('PTEST_ENABLED', '1', ' coreutils-native ostree-native aktualizr-native ', '', d)}"
-RDEPENDS_${PN}_class-target = "aktualizr-check-discovery aktualizr-configs lshw"
-RDEPENDS_${PN}-secondary = "aktualizr-check-discovery"
+RDEPENDS_${PN}_class-target = "aktualizr-configs lshw"
 RDEPENDS_${PN}-host-tools = "aktualizr aktualizr-repo aktualizr-cert-provider ${@bb.utils.contains('PACKAGECONFIG', 'sota-tools', 'garage-deploy garage-push', '', d)}"
 
 RDEPENDS_${PN}-ptest += "bash cmake curl python3-modules openssl-bin sqlite3 valgrind"
@@ -33,7 +32,7 @@ SRC_URI = " \
 SRC_URI[md5sum] = "c5e9968dfe78a7264ab9a8338c11725d"
 SRC_URI[sha256sum] = "3a19258d7a1825a308aca0da82f7a337985bec05e8951355c4c95f0fcf2444f4"
 
-SRCREV = "9c5ef10b7b91cc7d51cd22fc60446e734cf84690"
+SRCREV = "c50feb37034eceb1254429d3e3ed38e5b8a0dc60"
 BRANCH ?= "master"
 
 S = "${WORKDIR}/git"