Merge pull request #2516 from reubenmiller/issue-2448

feat: run initializations before starting main process
thin-edge · Dec 14, 2023 · e0a6927 · e0a6927 · github-actions · Dec 14, 2023
2 parents b4974b9 + 18d6e45
commit e0a6927
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 4 deletions.
diff --git a/configuration/init/systemd/c8y-firmware-plugin.service b/configuration/init/systemd/c8y-firmware-plugin.service
@@ -4,6 +4,7 @@ After=syslog.target network.target mosquitto.service
 
 [Service]
 User=tedge
+ExecStartPre=+-/usr/bin/tedge init
 ExecStart=/usr/bin/c8y-firmware-plugin
 Restart=on-failure
 RestartPreventExitStatus=255

diff --git a/configuration/init/systemd/tedge-agent.service b/configuration/init/systemd/tedge-agent.service
@@ -5,6 +5,7 @@ After=syslog.target network.target mosquitto.service
 [Service]
 User=tedge
 RuntimeDirectory=tedge-agent
+ExecStartPre=+-/usr/bin/tedge init
 ExecStart=/usr/bin/tedge-agent
 Restart=on-failure
 RestartPreventExitStatus=255

diff --git a/configuration/init/systemd/tedge-mapper-aws.service b/configuration/init/systemd/tedge-mapper-aws.service
@@ -4,6 +4,7 @@ After=syslog.target network.target mosquitto.service
 
 [Service]
 User=tedge
+ExecStartPre=+-/usr/bin/tedge init
 ExecStart=/usr/bin/tedge-mapper aws
 Restart=on-failure
 RestartPreventExitStatus=255

diff --git a/configuration/init/systemd/tedge-mapper-az.service b/configuration/init/systemd/tedge-mapper-az.service
@@ -4,6 +4,7 @@ After=syslog.target network.target mosquitto.service
 
 [Service]
 User=tedge
+ExecStartPre=+-/usr/bin/tedge init
 ExecStart=/usr/bin/tedge-mapper az
 Restart=on-failure
 RestartPreventExitStatus=255

diff --git a/configuration/init/systemd/tedge-mapper-c8y.service b/configuration/init/systemd/tedge-mapper-c8y.service
@@ -4,6 +4,7 @@ After=syslog.target network.target mosquitto.service
 
 [Service]
 User=tedge
+ExecStartPre=+-/usr/bin/tedge init
 ExecStart=/usr/bin/tedge-mapper c8y
 Restart=on-failure
 RestartPreventExitStatus=255

diff --git a/configuration/init/systemd/tedge-mapper-collectd.service b/configuration/init/systemd/tedge-mapper-collectd.service
@@ -4,6 +4,7 @@ After=syslog.target network.target mosquitto.service
 
 [Service]
 User=tedge
+ExecStartPre=+-/usr/bin/tedge init
 ExecStart=/usr/bin/tedge-mapper collectd
 Restart=on-failure
 RestartPreventExitStatus=255

diff --git a/configuration/init/systemd/tedge-watchdog.service b/configuration/init/systemd/tedge-watchdog.service
@@ -5,6 +5,7 @@ StartLimitIntervalSec=0
 
 [Service]
 Type=notify
+ExecStartPre=-/usr/bin/tedge init
 ExecStart=/usr/bin/tedge-watchdog
 Restart=on-failure
 WatchdogSec=30

diff --git a/tests/RobotFramework/tests/customizing/data_path_config.robot b/tests/RobotFramework/tests/customizing/data_path_config.robot
@@ -39,8 +39,6 @@ Custom Setup
     ${PARENT_SN}=    Setup
     Set Suite Variable    $PARENT_SN
     Set Suite Variable    $CHILD_SN    ${PARENT_SN}_child
-    Execute Command    sudo mkdir /var/test
-    Execute Command    sudo chown tedge:tedge /var/test
     Execute Command    sudo tedge config set data.path /var/test
 
 Custom Teardown

diff --git a/tests/RobotFramework/tests/customizing/log_path_config.robot b/tests/RobotFramework/tests/customizing/log_path_config.robot
@@ -17,8 +17,6 @@ Validate updated log path used by tedge-agent
 *** Keywords ***
 Custom Setup
     Setup
-    Execute Command    sudo mkdir /var/test
-    Execute Command    sudo chown tedge:tedge /var/test
 
 Custom Teardown
     Execute Command    sudo tedge config unset logs.path