Merge pull request #278 from advancedtelematic/feat/udp-socket-activation

UDP Socket activation for discovery service

3 files changed, 4 insertions, 3 deletions

diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py
index 0e7c11b..06884e5 100644
--- a/lib/oeqa/selftest/cases/updater.py
+++ b/lib/oeqa/selftest/cases/updater.py
@@ -544,7 +544,7 @@ class SecondaryTests(OESelftestTestCase):
         self.assertEqual(stderr, b'', 'Error: ' + stderr.decode())
 
     def test_secondary_listening(self):
-        print('Checking aktualizr-secondary is present')
+        print('Checking aktualizr-secondary service is listening')
         stdout, stderr, retcode = self.qemu_command('echo test | nc localhost 9030')
         self.assertEqual(retcode, 0, "Unable to connect to secondary")
 
@@ -591,7 +591,7 @@ def qemu_send_command(port, command):
     command = ['ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@localhost -p ' +
                str(port) + ' "' + command + '"']
     s2 = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    stdout, stderr = s2.communicate()
+    stdout, stderr = s2.communicate(timeout=60)
     return stdout, stderr, s2.returncode
 
 
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 5e683ac..79a89ef 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 = "fbb3404824c4eb239455c7fa1a794c26e2ea954d"
+SRCREV = "7d1d71a28a9ff0b14240b98600de3d541835b278"
 BRANCH ?= "master"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-sota/aktualizr/files/aktualizr-secondary.socket b/recipes-sota/aktualizr/files/aktualizr-secondary.socket
index 1cb4269..da0ee44 100644
--- a/recipes-sota/aktualizr/files/aktualizr-secondary.socket
+++ b/recipes-sota/aktualizr/files/aktualizr-secondary.socket
@@ -1,5 +1,6 @@
 [Socket]
 ListenStream=9030
+ListenDatagram=9031
 
 [Install]
 WantedBy=sockets.target
\ No newline at end of file