From 9680a96ee0e46f387daeb5a6abf5ba3814fa44b1 Mon Sep 17 00:00:00 2001
From: reubenmiller <reuben.d.miller@gmail.com>
Date: Wed, 4 Dec 2024 09:31:25 +0100
Subject: [PATCH] fix(self-update): remove updater container after collecting
 logs

---
 files/tedge/self_update.toml | 2 +-
 tests/main/self-update.robot | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/files/tedge/self_update.toml b/files/tedge/self_update.toml
index 6c50668..1676975 100644
--- a/files/tedge/self_update.toml
+++ b/files/tedge/self_update.toml
@@ -35,7 +35,7 @@ on_success = "collect-logs"
 on_error = "collect-logs"
 
 [collect-logs]
-script = "sh -c 'sudo -E tedge-container tools container-logs ${.payload.containerName}-updater && sudo -E tedge-container tools container-remove ${.payload.containerName}-updater'"
+script = "sh -c 'sudo -E tedge-container tools container-logs ${.payload.containerName}-updater; sudo -E tedge-container tools container-remove ${.payload.containerName}-updater'"
 on_success = "verify"
 on_error = "verify"
 
diff --git a/tests/main/self-update.robot b/tests/main/self-update.robot
index 546aa95..72771fd 100644
--- a/tests/main/self-update.robot
+++ b/tests/main/self-update.robot
@@ -45,6 +45,9 @@ Self update using software update operation
     Device Should Have Installed Software
     ...    {"name": "tedge", "version": "ghcr.io/thin-edge/tedge-container-bundle:99.99.2", "softwareType": "container"}
 
+    # updater container should be removed (logs are already collected as part of the workflow)
+    Cumulocity.Should Have Services    service_type=container    name=tedge-updater    min_count=0    max_count=0
+
 Rollback when trying to install a non-tedge based image
     # pre-condition
     Device Should Have Installed Software