Merge lp:~cypressyew/checkbox/systemd-server into lp:checkbox

[Po-Hsu Lin]

Add the service file for systemd on Vivid server, explicitly dump the test log to /tmp with "server" in the file name to avoid confusion. (It should be further improved, e.g. by adding "desktop" to distinguish them later in bug 1451658)

The last puzzle of this is to "enable" the service file, with command: systemctl enable checkbox-sru.service, to allow it start automatically on boot.
But this may need to be done in the preseed file. Unless there is another way to run some script like what we did in desktop systems (/etc/xdg/autostart/checkbox-sru.desktop)

[Sylvain Pineau (sylvain-pineau)]

According to https://wiki.ubuntu.com/SystemdForUpstartUsers#Automatic_starting

Adding:

[Install]
WantedBy=multi-user.target

should be all that we need to enable the autostart of the checkbox service file (desktop & server)

We shouldn’t have to manually start the service in the preseed IMHO.
I'll continue testing your branch today.

[Po-Hsu Lin (cypressyew)]

Yes, this part is for allowing it to start automatically on boot.

But I found that we still need to enable the service file manually on first boot with "systemctl enable checkbox-sru.service" command, which will create a softlink of the service file under the "target" directory we assigned here.

[Sylvain Pineau (sylvain-pineau)]

Let's land the service file to build correctly the CI loop package and see how to start the service afterwards

review: Approve

[Sylvain Pineau (sylvain-pineau)]

The right way to enable the services would have been to use dh_systemd but this helper is not available for precise. So instead of creating post-installation scripts to enable them (that could lead to two runs on desktop systems), let's add the following lines to the server preseed:

systemctl enable checkbox-sru
systemctl enable checkbox-ci-installed-notifier

This will create the following needed symlinks in /etc/systemd/system/multi-user.target.wants:

checkbox-ci-installed-notifier.service -> /lib/systemd/system/checkbox-ci-installed-notifier.service
checkbox-sru.service -> /lib/systemd/system/checkbox-sru.service

With those symlinks, the two services are sucessfully started on boot (tested on a vivid server):

systemctl status checkbox-sru
● checkbox-sru.service - CheckBox SRU on server
   Loaded: loaded (/lib/systemd/system/checkbox-sru.service; enabled; vendor preset: enabled)
   Active: inactive (dead) since Fri 2015-05-08 16:14:31 CEST; 41s ago
  Process: 847 ExecStopPost=/bin/systemctl start checkbox-ci-mailer.service (code=exited, status=0/SUCCESS)
  Process: 831 ExecStart=/bin/systemctl start checkbox-ci-installed-notifier.service (code=exited, status=0/SUCCESS)
  Process: 827 ExecStartPre=/bin/mkdir -p /var/cache/plainbox (code=exited, status=0/SUCCESS)
 Main PID: 831 (code=exited, status=0/SUCCESS)

May 08 16:14:31 ubuntu systemd[1]: Starting CheckBox SRU on server...
May 08 16:14:31 ubuntu systemd[1]: Started CheckBox SRU on server.

[Po-Hsu Lin (cypressyew)]

Thanks for confirming and testing this, I will propose a MR for checkbox-satellite soon.

=== modified file 'checkbox-ng/contrib/checkbox-ci-installed-notifier.conf'
--- checkbox-ng/contrib/checkbox-ci-installed-notifier.conf	2015-04-30 08:22:48 +0000
+++ checkbox-ng/contrib/checkbox-ci-installed-notifier.conf	2015-05-05 11:07:16 +0000
@@ -13,7 +13,8 @@
 start on checkbox-sru-started
 
 task
-
+# Note that the autostart file here for server is different
+# in upstart and systemd version
 env CHECKBOX_SERVER_CONF=/etc/init/checkbox-sru.conf
 env CHECKBOX_DESKTOP_XDG=/etc/xdg/autostart/checkbox-sru.desktop
 

=== modified file 'checkbox-ng/contrib/checkbox-ci-installed-notifier.service'
--- checkbox-ng/contrib/checkbox-ci-installed-notifier.service	2015-04-30 08:22:48 +0000
+++ checkbox-ng/contrib/checkbox-ci-installed-notifier.service	2015-05-05 11:07:16 +0000
@@ -1,8 +1,9 @@
 [Unit]
 Description=CheckBox SRU mini CI notifier
+After=network-online.target
 # CheckBox mini CI notifier.
 #
-# This waits for a "checkbox-sru-started" event and then
+# This waits for a the "Network is Online" target and then
 # uses curl to post the test starting notification
 # to a configurable CGI URL. The CGI can do whatever it
 # wants, such as checking the test is run or not.
@@ -13,8 +14,11 @@
 [Service]
 Type=oneshot
 #Type=simple # It does not work with this
-Environment=CHECKBOX_SERVER_CONF=/etc/init/checkbox-sru.conf
+Environment=CHECKBOX_SERVER_CONF=/lib/systemd/system/checkbox-sru.service
 Environment=CHECKBOX_DESKTOP_XDG=/etc/xdg/autostart/checkbox-sru.desktop
 ExecStartPre=/bin/sh -ec '[ -f /etc/default/plainbox-ci-mailer ] || exit 1'
 ExecStartPre=/bin/sh -ec '[ -x /usr/bin/curl ] || exit 1'
 ExecStart=/usr/bin/checkbox-ci-script.sh notification
+
+[Install]
+WantedBy=multi-user.target

=== modified file 'checkbox-ng/contrib/checkbox-ci-mailer.conf'
--- checkbox-ng/contrib/checkbox-ci-mailer.conf	2015-04-30 08:22:48 +0000
+++ checkbox-ng/contrib/checkbox-ci-mailer.conf	2015-05-05 11:07:16 +0000
@@ -14,7 +14,7 @@
 
 task
 
-env CHECKBOX_UPSTART_LOG=/var/log/upstart/checkbox-sru.log
+env CHECKBOX_UPSTART_LOG=/tmp/checkbox-server.log
 env CHECKBOX_DESKTOP_LOG=/tmp/checkbox.log
 
 pre-start script

=== modified file 'checkbox-ng/contrib/checkbox-ci-mailer.service'
--- checkbox-ng/contrib/checkbox-ci-mailer.service	2015-04-30 08:22:48 +0000
+++ checkbox-ng/contrib/checkbox-ci-mailer.service	2015-05-05 11:07:16 +0000
@@ -14,7 +14,7 @@
 [Service]
 Type=oneshot
 #Type=simple # It does not work with this
-Environment=CHECKBOX_UPSTART_LOG=/var/log/upstart/checkbox-sru.log
+Environment=CHECKBOX_UPSTART_LOG=/tmp/checkbox-server.log
 Environment=CHECKBOX_DESKTOP_LOG=/tmp/checkbox.log
 ExecStartPre=/bin/sh -ec '[ -f /etc/default/plainbox-ci-mailer ] || exit 1'
 ExecStartPre=/bin/sh -ec '[ -x /usr/bin/curl ] || exit 1'

=== modified file 'checkbox-ng/contrib/checkbox-sru.conf'
--- checkbox-ng/contrib/checkbox-sru.conf	2015-04-06 06:54:52 +0000
+++ checkbox-ng/contrib/checkbox-sru.conf	2015-05-05 11:07:16 +0000
@@ -3,7 +3,7 @@
 # Run SRU testing with CheckBoxNG 60 seconds after networking
 # has started to wait for DHCP to complete.
 
-description     "CheckBox SRU"
+description     "CheckBox SRU on server"
 
 # Make sure we start after networking
 start on runlevel [2345]
@@ -22,7 +22,7 @@
 
 script
   initctl emit checkbox-sru-started
-  exec /usr/bin/checkbox sru
+  exec /usr/bin/checkbox sru > /tmp/checkbox-server.log 2>&1
 end script
 
 post-stop script

=== modified file 'checkbox-ng/contrib/checkbox-sru.desktop'
--- checkbox-ng/contrib/checkbox-sru.desktop	2015-05-04 07:40:12 +0000
+++ checkbox-ng/contrib/checkbox-sru.desktop	2015-05-05 11:07:16 +0000
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=CheckBox SRU
+Name=CheckBox SRU for Desktop
 Comment=CheckBox can run after login to test a system automatically.
 Icon=checkbox
 Exec=sh -c "pidof systemd && { sudo systemctl start checkbox-ci-installed-notifier.service; /usr/bin/checkbox sru --check-config >/tmp/checkbox.log 2>&1; sudo systemctl start checkbox-ci-mailer.service; } || { sudo initctl emit checkbox-sru-started; /usr/bin/checkbox sru --check-config >/tmp/checkbox.log 2>&1; sudo initctl emit checkbox-sru-finished; }"

=== added file 'checkbox-ng/contrib/checkbox-sru.service'
--- checkbox-ng/contrib/checkbox-sru.service	1970-01-01 00:00:00 +0000
+++ checkbox-ng/contrib/checkbox-sru.service	2015-05-05 11:07:16 +0000
@@ -0,0 +1,21 @@
+[Unit]
+Description=CheckBox SRU on server
+After=network-online.target
+After=checkbox-ci-installed-notifier.service
+# checkbox sru - Run CheckBox SRU tests after booting 
+#
+# Run SRU testing with CheckBoxNG after networking
+# has started and connection available.
+
+[Service]
+Type=oneshot
+ExecStartPre=/bin/sh -c "/usr/bin/checkbox check-config || exit 1"
+ExecStartPre=/bin/mkdir -p /var/cache/plainbox
+ExecStart=/bin/systemctl start checkbox-ci-installed-notifier.service 
+ExecStart=/bin/sh -c "/usr/bin/checkbox sru > /tmp/checkbox-server.log 2>&1"
+ExecStopPost=/bin/systemctl start checkbox-ci-mailer.service
+
+[Install]
+# This is roughly equivalent to "start on runlevel [2345]"
+WantedBy=multi-user.target
+#stop on runlevel [!023456]