Fix cml.service not waiting for process shutdown (#160)

iterative · Jul 8, 2021 · 65a1177 · 65a1177
1 parent 9fdaf56
commit 65a1177
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 16 deletions.
diff --git a/iterative/resource_runner.go b/iterative/resource_runner.go
@@ -327,15 +327,14 @@ sudo chmod +x /usr/bin/cml.sh
 
 sudo bash -c 'cat << EOF > /etc/systemd/system/cml.service
 [Unit]
-  Description=cml service
+  After=default.target
 
 [Service]
-  Type=oneshot
-  RemainAfterExit=yes
+  Type=simple
   ExecStart=/usr/bin/cml.sh
 
 [Install]
-  WantedBy=multi-user.target
+  WantedBy=default.target
 EOF'
 
 {{if .cloud}}

diff --git a/iterative/testdata/script_template_cloud_aws.golden b/iterative/testdata/script_template_cloud_aws.golden
@@ -66,15 +66,14 @@ sudo chmod +x /usr/bin/cml.sh
 
 sudo bash -c 'cat << EOF > /etc/systemd/system/cml.service
 [Unit]
-  Description=cml service
+  After=default.target
 
 [Service]
-  Type=oneshot
-  RemainAfterExit=yes
+  Type=simple
   ExecStart=/usr/bin/cml.sh
 
 [Install]
-  WantedBy=multi-user.target
+  WantedBy=default.target
 EOF'
 
 

diff --git a/iterative/testdata/script_template_cloud_azure.golden b/iterative/testdata/script_template_cloud_azure.golden
@@ -67,15 +67,14 @@ sudo chmod +x /usr/bin/cml.sh
 
 sudo bash -c 'cat << EOF > /etc/systemd/system/cml.service
 [Unit]
-  Description=cml service
+  After=default.target
 
 [Service]
-  Type=oneshot
-  RemainAfterExit=yes
+  Type=simple
   ExecStart=/usr/bin/cml.sh
 
 [Install]
-  WantedBy=multi-user.target
+  WantedBy=default.target
 EOF'
 
 

diff --git a/iterative/testdata/script_template_cloud_invalid.golden b/iterative/testdata/script_template_cloud_invalid.golden
@@ -62,15 +62,14 @@ sudo chmod +x /usr/bin/cml.sh
 
 sudo bash -c 'cat << EOF > /etc/systemd/system/cml.service
 [Unit]
-  Description=cml service
+  After=default.target
 
 [Service]
-  Type=oneshot
-  RemainAfterExit=yes
+  Type=simple
   ExecStart=/usr/bin/cml.sh
 
 [Install]
-  WantedBy=multi-user.target
+  WantedBy=default.target
 EOF'