Use cloud-init services as anchor for jenkins-agent service

Change-Id: Ic3f613f4ab85732a42bccbed286b766a27b08834

diff --git a/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh b/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh
index 56073dfcab35f5d69d286ec3a180df664bd42564..6e382393409001abc4ff5182fbf2e8543de19500 100644 (file)
--- a/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh
+++ b/maintenance-ci/common/scripts/build_base_swarm_slave_image.sh
@@ -67,8 +67,8 @@ chmod +x /home/jenkins/launch_jenkins_agent.sh
 cat > /etc/systemd/system/jenkins-swarm-agent.service << EOF
 [Unit]
 Description=jenkins-swarm-agent
-Wants=network-online.target
-After=network-online.target
+Wants=cloud-final.target
+After=cloud-final.target
 
 [Service]
 User=jenkins
@@ -77,7 +77,7 @@ Type=simple
 ExecStart=/home/jenkins/launch_jenkins_agent.sh
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=cloud-init.target
 EOF
 systemctl enable jenkins-swarm-agent
 

diff --git a/maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh b/maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh
index a3596ca50999adfc16882ddb49ca5311cec0fb28..f0ba5eb8df3aedfe4bb8053193876c6491e72b60 100644 (file)
--- a/maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh
+++ b/maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh
@@ -108,8 +108,8 @@ chmod +x /home/jenkins/launch_jenkins_agent.sh
 cat > /etc/systemd/system/jenkins-swarm-agent.service << EOF
 [Unit]
 Description=jenkins-swarm-agent
-Wants=network-online.target
-After=network-online.target
+Wants=cloud-final.target
+After=cloud-final.target
 
 [Service]
 User=jenkins
@@ -118,7 +118,7 @@ Type=simple
 ExecStart=/home/jenkins/launch_jenkins_agent.sh
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=cloud-init.target
 EOF
 systemctl enable jenkins-swarm-agent