Merge pull request #353 from advancedtelematic/feat/bump-aktualizr-rocko

aktualizr: Get latest for PRO-H#2 sprint. (rocko)

3 files changed, 68 insertions, 5 deletions

diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py
index 190d85d..ed4d8d7 100644
--- a/lib/oeqa/selftest/cases/updater.py
+++ b/lib/oeqa/selftest/cases/updater.py
@@ -193,6 +193,49 @@ class AutoProvTests(OESelftestTestCase):
                       'Legacy secondary initialization failed: ' + stderr.decode() + stdout.decode())
 
 
+class ManualControlTests(OESelftestTestCase):
+
+    def setUpLocal(self):
+        layer = "meta-updater-qemux86-64"
+        result = runCmd('bitbake-layers show-layers')
+        if re.search(layer, result.output) is None:
+            # Assume the directory layout for finding other layers. We could also
+            # make assumptions by using 'show-layers', but either way, if the
+            # layers we need aren't where we expect them, we are out of like.
+            path = os.path.abspath(os.path.dirname(__file__))
+            metadir = path + "/../../../../../"
+            self.meta_qemu = metadir + layer
+            runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu)
+        else:
+            self.meta_qemu = None
+        self.append_config('MACHINE = "qemux86-64"')
+        self.append_config('SOTA_CLIENT_PROV = " aktualizr-auto-prov "')
+        self.append_config('SYSTEMD_AUTO_ENABLE_aktualizr = "disable"')
+        self.qemu, self.s = qemu_launch(machine='qemux86-64')
+
+    def tearDownLocal(self):
+        qemu_terminate(self.s)
+        if self.meta_qemu:
+            runCmd('bitbake-layers remove-layer "%s"' % self.meta_qemu, ignore_status=True)
+
+    def qemu_command(self, command):
+        return qemu_send_command(self.qemu.ssh_port, command)
+
+    def test_manual_running_mode_once(self):
+        """
+        Disable the systemd service then run aktualizr manually
+        """
+        sleep(20)
+        stdout, stderr, retcode = self.qemu_command('aktualizr-info')
+        self.assertIn(b'Fetched metadata: no', stdout,
+                      'Aktualizr should not have run yet' + stderr.decode() + stdout.decode())
+
+        stdout, stderr, retcode = self.qemu_command('aktualizr --running-mode=once')
+
+        stdout, stderr, retcode = self.qemu_command('aktualizr-info')
+        self.assertIn(b'Fetched metadata: yes', stdout,
+                      'Aktualizr should have run' + stderr.decode() + stdout.decode())
+
 class RpiTests(OESelftestTestCase):
 
     def setUpLocal(self):
@@ -554,7 +597,7 @@ class SecondaryTests(OESelftestTestCase):
 
     def test_secondary_listening(self):
         print('Checking aktualizr-secondary service is listening')
-        stdout, stderr, retcode = self.qemu_command('echo test | nc localhost 9030')
+        stdout, stderr, retcode = self.qemu_command('aktualizr-check-discovery')
         self.assertEqual(retcode, 0, "Unable to connect to secondary")
 
 
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index ca0bfb6..6096c7b 100755
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -15,6 +15,9 @@ RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES
 RDEPENDS_${PN}_append_class-target = " ${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot', 'u-boot-fw-utils', '')}"
 RDEPENDS_${PN}_append_class-target = " ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'ubootenv', '  aktualizr-uboot-env-rollback', '', d)} "
 
+RDEPENDS_${PN}_append_class-target = " ${PN}-tools "
+RDEPENDS_${PN}-secondary_append_class-target = " ${PN}-tools "
+
 PV = "1.0+git${SRCPV}"
 PR = "7"
 
@@ -25,7 +28,7 @@ SRC_URI = " \
   file://aktualizr-secondary.socket \
   file://aktualizr-serialcan.service \
   "
-SRCREV = "767098f45e2e05d5bbd817f9b3b3aa44844da8ec"
+SRCREV = "e9faff35ffa8c31cbf3c5fb1c3c6ed4f5f50e500"
 BRANCH ?= "master"
 
 S = "${WORKDIR}/git"
@@ -85,7 +88,7 @@ do_install_append_class-native () {
     install -m 0644 ${B}/src/sota_tools/garage-sign/lib/* ${D}${libdir}
 }
 
-PACKAGES =+ " ${PN}-examples ${PN}-host-tools ${PN}-secondary "
+PACKAGES =+ " ${PN}-examples ${PN}-host-tools ${PN}-tools ${PN}-secondary "
 
 FILES_${PN} = " \
                 ${bindir}/aktualizr \
@@ -116,6 +119,10 @@ FILES_${PN}-host-tools = " \
                 ${libdir}/sota/sota_uboot_env.toml \
                 "
 
+FILES_${PN}-tools = " \
+                ${bindir}/aktualizr-check-discovery \
+                "
+
 FILES_${PN}-secondary = " \
                 ${bindir}/aktualizr-secondary \
                 ${libdir}/sota/sota_secondary.toml \
diff --git a/recipes-sota/aktualizr/garage-sign-version.inc b/recipes-sota/aktualizr/garage-sign-version.inc
index f2d04e8..1b89a3d 100644
--- a/recipes-sota/aktualizr/garage-sign-version.inc
+++ b/recipes-sota/aktualizr/garage-sign-version.inc
@@ -11,8 +11,21 @@ python () {
                 url = url_file.read().decode().strip(' \t\n') + '/health/version'
         except (KeyError, ValueError, RuntimeError):
             return
-    r = urllib.request.urlopen(url)
-    if r.code != 200:
+    connected = False
+    tries = 3
+    for i in range(tries):
+        try:
+            r = urllib.request.urlopen(url)
+            if r.code == 200:
+                connected = True
+                break
+            else:
+                print('Bad return code from server ' + url + ': ' + str(r.code) +
+                      ' (attempt ' + str(i + 1) + ' of ' + str(tries) + ')')
+        except urllib.error.URLError as e:
+            print('Error connecting to server ' + url + ': ' + str(e) +
+                  ' (attempt ' + str(i + 1) + ' of ' + str(tries) + ')')
+    if not connected:
         return
     resp = r.read().decode('utf-8')
     j = json.loads(resp)