CUA allow rollback when owner denies update (eclipse-kanto#237)

* [eclipse-kanto#236] CUA allow rollback when owner denies update --------- Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov3@bosch.com>
bosch-io · May 15, 2024 · 7084ea6 · 7084ea6
1 parent a951f1c
commit 7084ea6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/containerm/mgr/mgr_internal_init.go b/containerm/mgr/mgr_internal_init.go
@@ -47,7 +47,6 @@ func newContainerMgr(metaPath string, execPath string, defaultCtrsStopTimeout ti
 		restartCtrsMgrCache:    newRestartMgrCache(),
 		containerRepository:    &ctrRepository,
 	}
-	fmt.Println("mgr:", defaultCtrsStopTimeout.String())
 	ctrClient.SetContainerExitHooks(manager.exitedAndRelease)
 
 	return manager, nil

diff --git a/containerm/updateagent/update_operation.go b/containerm/updateagent/update_operation.go
@@ -215,9 +215,10 @@ var baselineCommandHandlers = map[types.CommandType]struct {
 		commandHandler:         activate,
 	},
 	types.CommandRollback: {
-		expectedBaselineStatus: []types.StatusType{types.BaselineStatusActivationFailure, types.BaselineStatusActivationSuccess},
-		baselineFailureStatus:  types.BaselineStatusRollbackFailure,
-		commandHandler:         rollback,
+		expectedBaselineStatus: []types.StatusType{types.BaselineStatusDownloadSuccess, types.BaselineStatusUpdateSuccess,
+			types.BaselineStatusActivationFailure, types.BaselineStatusActivationSuccess},
+		baselineFailureStatus: types.BaselineStatusRollbackFailure,
+		commandHandler:        rollback,
 	},
 	types.CommandCleanup: {
 		baselineFailureStatus: types.BaselineStatusCleanup,